v0.8.2, URL parsing

- Change to version 0.8.2 - Change /connection command duration output - Allow URLs to contain more than one consecutive point (..) - Update help
aullik · Apr 26, 2016 · 04d37ee · 04d37ee
1 parent fcc91e9
commit 04d37ee
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 49 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -35,4 +35,4 @@
 *.png           binary
 *.so            binary
 *.war           binary
-*.wav		binary
+*.wav           binary
diff --git a/src/chatty/Chatty.java b/src/chatty/Chatty.java
@@ -52,7 +52,7 @@ public class Chatty {
     /**
      * Version number of this version of Chatty
      */
-    public static final String VERSION = "0.8.2b";
+    public static final String VERSION = "0.8.2";
 
     /**
      * Enable Version Checker (if you compile and distribute this yourself, you

diff --git a/src/chatty/Irc.java b/src/chatty/Irc.java
@@ -1,6 +1,7 @@
 
 package chatty;
 
+import chatty.util.DateTime;
 import chatty.util.DelayedActionQueue;
 import chatty.util.DelayedActionQueue.DelayedActionListener;
 import java.net.InetSocketAddress;
@@ -157,25 +158,7 @@ public String getConnectionInfo() {
     }
 
     private String getConnectedSince() {
-        long duration = (System.currentTimeMillis() - connectedSince) / 1000;
-        String text = "";
-        if (duration > 60) {
-            long minutes = duration / 60;
-            if (minutes == 1) {
-                text += minutes + " minute";
-            }
-            else {
-                text += minutes + " minutes";
-            }
-        } else {
-            if (duration == 1) {
-                text = duration + " second";
-            }
-            else {
-                text = duration + " seconds";
-            }
-        }
-        return text;
+        return DateTime.ago(connectedSince);
     }
 
     /**
@@ -194,6 +177,7 @@ private String getConnectedSince() {
      * @param port The port of the server
      * @param nick The nick to connect with
      * @param pass The password (required at Twitch)
+     * @param securedPorts Which ports should be treated as SSL
      */
     public final void connect(final String server, final String port,
             final String nick, final String pass, Collection<Integer> securedPorts) {

diff --git a/src/chatty/gui/components/help/help-addressbook.html b/src/chatty/gui/components/help/help-addressbook.html
@@ -214,6 +214,10 @@ <h3><a name="subs-cats">Automatic Subscriber Categories</a></h3>
             user to the <code>12months</code> category</li>
         <li><code>.. just subscribed!</code> won't do anything</li>
     </ul>
+
+    <p>Remember that this relies on the notification message to be in a certain
+        format, so this may not be the most reliable thing, especially if Twitch
+        decides to change the message in some way.</p>
 </body>
 </html>
 
diff --git a/src/chatty/gui/components/help/help-guide_folders.html b/src/chatty/gui/components/help/help-guide_folders.html
@@ -67,6 +67,23 @@ <h3>Settings Directory</h3>
             <td>|&nbsp; &nbsp;|-- &lt;various cache files&gt;</td>
             <td class="fileComment">Cached emotes/image files</td>
         </tr>
+        <tr>
+            <td>|-- debuglogs</td>
+            <td class="fileCommentFolder">[Folder] Files intended to be read
+                by the user</td>
+        </tr>
+        <tr>
+            <td>|&nbsp; &nbsp;|-- debug_session.log.x</td>
+            <td class="fileComment">Last session debug log (overwritten every run)</td>
+        </tr>
+        <tr>
+            <td>|&nbsp; &nbsp;|-- debugx.log.x</td>
+            <td class="fileComment">Rotating debug log</td>
+        </tr>
+        <tr>
+            <td>|&nbsp; &nbsp;|-- debug_ircx.log.x</td>
+            <td class="fileComment">Rotating raw IRC log (only if enabled)</td>
+        </tr>
         <tr>
             <td>|-- exported</td>
             <td class="fileCommentFolder">[Folder] Files intended to be read
@@ -104,18 +121,6 @@ <h3>Settings Directory</h3>
             <td>|-- statusPresets</td>
             <td class="fileComment">[Settings] Stream Title/Game presets (Admin Dialog)</td>
         </tr>
-        <tr>
-            <td>|-- debug_session.log.x</td>
-            <td class="fileComment">Last session debug log (overwritten every run)</td>
-        </tr>
-        <tr>
-            <td>|-- debugx.log.x</td>
-            <td class="fileComment">Rotating debug log</td>
-        </tr>
-        <tr>
-            <td>|-- debug_ircx.log.x</td>
-            <td class="fileComment">Rotating raw IRC log (only if enabled)</td>
-        </tr>
 
     </table>
 

diff --git a/src/chatty/gui/components/help/help-releases.html b/src/chatty/gui/components/help/help-releases.html
@@ -40,19 +40,19 @@ <h1><a name="top">Release Information</a></h1>
     full list of changes.</p>
 
     <h2>
-        <a name="0.8.2">Version 0.8.2</a> <a name="latest">(This one!)</a> (2016-03-10)
+        <a name="0.8.2">Version 0.8.2</a> <a name="latest">(This one!)</a> (2016-04-26)
         <a href="#top" class="top">[back to top]</a>
     </h2>
     <p>During March Twitch migrated Twitch Chat to new servers (Amazon AWS),
         which you probably noticed due to some issues for some third-party
-        tools. This however also brought some improvements.</p>
+        tools. This however also brought some improvements:</p>
 
     <ul>
         <li>Twitch Chat now supports SSL on ports 6697 and 443
             <ul>
                 <li>Chatty will automatically add these to the default ports if
                     your port setting is still on the previous default
-                    (otherwise you might have to add it yourself).</li>
+                    (otherwise you might have to add them yourself).</li>
             </ul>
         </li>
         <li>No separate Event Chat servers anymore
@@ -77,11 +77,12 @@ <h3>Full Changelog</h3>
 - Added auto-unhost feature (to unhost when your stream goes live, disabled by
   default)
 - Added new Twitch Player URL in context menu
-- Added feature to automatically add Addressbook categories on Subscriber
+- Added feature to automatically add Addressbook categories based on Subscriber
   notifications (experimental)
 - Added feature to automatically copy messages into clipboard
 - Admin Dialog: Added error message for trying to set invalid stream status
 - Added context menu entries to directly host channel
+- Made URL detection a bit more lenient
 - Updated help
 
 System
@@ -94,14 +95,15 @@ <h3>Full Changelog</h3>
   menu bar)
 - Moved debug logs into separate directory
 - Added /proc command to start native processes out of Chatty
-- Made restoring window position a bit more lenient with it being off-screen
+- Made restoring window position more lenient for partly off-screen positions
 
 Connection
 ==========
-- Bouncer: Some changes allowing your to connect to a Bouncer
-- Whispering: Moved to main chat, hide userlist for Whisper tabs
-- Added auto-responses to whispers for ignored/non-whitelisted users (disabled
-  by default)
+- Bouncer: Some changes allowing you to connect to a Bouncer
+- Whispers: Moved to main chat (AWS)
+- Whispers: Hidden userlist for Whisper tabs by default
+- Whispers: Added auto-responses for ignored/non-whitelisted users (disabled by
+  default)
 - Increased max reconnection attempts to 40
 - Added `force_verify=true` parameter to Authorize URL (makes Twitch always ask
   if you want to Authorize, makes sure you are logged in to the right account)
@@ -148,7 +150,8 @@ <h3>Full Changelog</h3>
 - Check if Java supports opening URLs on the current platform and run native
   command if necessary
 - Fixed sounds not being closed when finished playing
-- Fixed tabs not changing correctly on System Look&Feel
+- Fixed tabs not changing correctly on System Look&amp;Feel
+- Fixed error on host notification due to moving Whispers to AWS
 </pre>
 
     <h2>

diff --git a/src/chatty/gui/components/help/help-settings.html b/src/chatty/gui/components/help/help-settings.html
@@ -217,6 +217,9 @@ <h3>General Settings</h3>
         <li><strong>Scale</strong>: The relative size of how emotes are displayed in chat (100% is regular size).</li>
         <li><strong>Maximum Height</strong>: The maximum height of emotes in chat (in pixels). Use 0 to allow any height.</li>
         <li><strong>Emotes Dialog</strong>: The relative size of how emotes are displayed in the Emotes Dialog (100% is regular size).</li>
+        <li><strong>Double-click on emote closes Emote Dialog</strong>: If
+            enabled, double-clicking on an emote in the Emote Dialog closes the
+            Emote Dialog.</li>
     </ul>
 
     <h3>Ignored Emotes</h3>

diff --git a/src/chatty/gui/components/help/help-troubleshooting.html b/src/chatty/gui/components/help/help-troubleshooting.html
@@ -211,7 +211,7 @@ <h2>
     <h3>Run from commandline</h3>
     <p>Running Chatty from the commandline has the advantage of being able to
     get messages from before the GUI is established. It also may work when Java
-    isn't integrated into the OS correctly (even when installed).</p>
+    isn't integrated into the OS correctly (but is installed).</p>
 
     <ol>
         <li>Open a commandline window on the directory where the
@@ -233,6 +233,12 @@ <h3>Run from commandline</h3>
         <a href="help-guide_create_shortcut.html">shortcut</a> or a .bat-file to
         start Chatty similiar to entering the command above, but much more
         conveniently.</p>
+
+    <p>If Chatty doesn't start when you enter the above command, check the
+        commandline window for error messages.
+        <a href="help.html#contact">Send</a> a screenshot of the commandline
+        window along with information on what other things you tried if you
+        require further assistance with it.</p>
 
     <h3>Check Association of .jar with Java (Windows)</h3>
     <p>If the integration of Java into the OS may not be correct, and you want

diff --git a/src/chatty/gui/components/help/help.html b/src/chatty/gui/components/help/help.html
@@ -5,7 +5,7 @@
         <link rel="stylesheet" type="text/css" href="style.css" />
 </head>
 <body>
-    <h1><a name="top">Chatty (Version: 0.8.2b7)</a></h1>
+    <h1><a name="top">Chatty (Version: 0.8.2)</a></h1>
     <table>
         <tr>
             <td valign="top">

diff --git a/src/chatty/gui/components/textpane/ChannelTextPane.java b/src/chatty/gui/components/textpane/ChannelTextPane.java
@@ -1392,6 +1392,7 @@ public void printLine(String line, MutableAttributeSet style) {
      * @param text 
      * @param user 
      * @param style 
+     * @param emotes 
      */
     protected void printSpecials(String text, User user, MutableAttributeSet style,
             TagEmotes emotes) {
@@ -1461,10 +1462,6 @@ private void findLinks(String text, Map<Integer, Integer> ranges,
             if (!inRanges(start, ranges) && !inRanges(end,ranges)) {
                 String foundUrl = urlMatcher.group();
 
-                if (foundUrl.contains("..")) {
-                    continue;
-                }
-
                 // Check if URL contains ( ) like http://example.com/test(abc)
                 // or is just contained in ( ) like (http://example.com)
                 // (of course this won't work perfectly, but it should be ok)

diff --git a/src/chatty/util/MiscUtil.java b/src/chatty/util/MiscUtil.java
@@ -90,6 +90,14 @@ public static Map<String, String> parseArgs(String[] args) {
         return result;
     }
 
+    /**
+     * Attempt to move the file atomically, and if that fails try regular file
+     * replacing.
+     * 
+     * @param from The file to move
+     * @param to The target filename, which will be overwritten if it already
+     * exists
+     */
     public static void moveFile(Path from, Path to) {
         try {
             Files.move(from, to, ATOMIC_MOVE);
@@ -106,6 +114,12 @@ public static void moveFile(Path from, Path to) {
         }
     }
 
+    /**
+     * Returns the StackTrace of the given Throwable as a String.
+     * 
+     * @param e
+     * @return 
+     */
     public static String getStackTrace(Throwable e) {
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw));