ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chat filter: fix collapsing replayed public chat

Browse Source 
Public chat is both replayed and also collapsed. Since replayed messages
don't send chat message events, all replayed messages would be filtered
due to the last message id not being updated for any of them. Instead,
set all stored messages ids to -1 on login, since the ids are
invalidated anyway, and then use it to not collapse replayed chat.
This commit is contained in:
Adam
2021-05-30 14:17:50 -04:00
parent d4dc309cf5
commit b6462e4619
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
View File

@@ -55,6 +55,7 @@ import net.runelite.api.MessageNode;
import net.runelite.api.Player;
import net.runelite.api.clan.ClanChannel;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.OverheadTextChanged;
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.client.config.ConfigManager;
@@ -139,6 +140,19 @@ public class ChatFilterPlugin extends Plugin
client.refreshChat();
}
@Subscribe
public void onGameStateChanged(GameStateChanged gameStateChanged)
{
switch (gameStateChanged.getGameState())
{
// Login drops references to all messages and also resets the global message id counter.
// Invalidate the message id so it doesn't collide later when rebuilding the chatfilter.
case HOPPING:
case LOGGING_IN:
duplicateChatCache.values().forEach(d -> d.messageId = -1);
}
}
@Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent event)
{
@@ -205,7 +219,10 @@ public class ChatFilterPlugin extends Plugin
if (!blockMessage && shouldCollapse)
{
Duplicate duplicateCacheEntry = duplicateChatCache.get(name + ":" + message);
if (duplicateCacheEntry != null)
// If messageId is -1 then this is a replayed message, which we can't easily collapse since we don't know
// the most recent message. This is only for public chat since it is the only thing both replayed and also
// collapsed. Just allow uncollapsed playback.
if (duplicateCacheEntry != null && duplicateCacheEntry.messageId != -1)
{
blockMessage = duplicateCacheEntry.messageId != messageId ||
((chatMessageType == PUBLICCHAT || chatMessageType == MODCHAT) &&