diff --git a/src/chatty/StatusHistory.java b/src/chatty/StatusHistory.java
index fdb115618..78a528516 100644
--- a/src/chatty/StatusHistory.java
+++ b/src/chatty/StatusHistory.java
@@ -5,11 +5,9 @@
import chatty.util.settings.SettingsListener;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.logging.Logger;
/**
diff --git a/src/chatty/TwitchConnection.java b/src/chatty/TwitchConnection.java
index 021427801..de12daa45 100644
--- a/src/chatty/TwitchConnection.java
+++ b/src/chatty/TwitchConnection.java
@@ -927,7 +927,7 @@ void onNotice(String nick, String from, String text) {
return;
}
// Should only be from the server for now
- listener.onInfo("[Notice] " + text);
+ listener.onNotice(text);
}
@Override
@@ -954,7 +954,7 @@ void onQueryMessage(String nick, String from, String text) {
listener.onSpecialMessage(nick, text);
}
if (nick.equals("jtv")) {
- infoMessage(null, text);
+ listener.onInfo("[Info] "+text);
}
}
@@ -1272,9 +1272,27 @@ public interface ConnectionListener {
void onNotice(String message);
+ /**
+ * An info message to a specific channel, usually intended to be
+ * directly output to the user.
+ *
+ * The channel should not be null. If no channel is associated, use
+ * {@link onInfo(String) onInfo(infoMessage)} instead.
+ *
+ * @param channel The channel the info message belongs to
+ * @param infoMessage The info message
+ */
void onInfo(String channel, String infoMessage);
- void onInfo(String message);
+ /**
+ * An info message, usually intended to be directly output to the user.
+ *
+ * Since no channel is associated, this is likely to be output to the
+ * currently active channel/tab.
+ *
+ * @param infoMessage The info message
+ */
+ void onInfo(String infoMessage);
void onGlobalInfo(String message);
diff --git a/src/chatty/gui/components/help/help-bouncer.html b/src/chatty/gui/components/help/help-bouncer.html
index 3f1812fad..b16a989e1 100644
--- a/src/chatty/gui/components/help/help-bouncer.html
+++ b/src/chatty/gui/components/help/help-bouncer.html
@@ -59,9 +59,10 @@ Configuring the Bouncer
CAP REQ :twitch.tv/tags
CAP REQ :twitch.tv/commands
- To receive a userlist at all, you also need to send (Twitch Chat will
- only send the userlist on join and under some circumstances it may not
- send a userlist at all):
+ To receive a userlist at all, you also need to send the following (even
+ then Twitch Chat will only send the userlist on join and then update it
+ via JOINs/PARTs, and under some circumstances it may not send a userlist
+ at all):
CAP REQ :twitch.tv/membership
@@ -78,9 +79,8 @@ Notes
The Channel State (Subonly, Slowmode, ..) won't always be correct
because the Bouncer won't send the state on join if the channel is
already joined on the Bouncer.
- Connecting to the Whisper servers directly won't work since that
- connection will try to use the same password as you set for the
- Bouncer.
+ Receiving Whispers may not work, depending on whether the Bouncer
+ forwards the WHISPER command to Chatty.