From 14daa9dfef7997881437d6d043e5048b77b03280 Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Mon, 2 Nov 2020 20:13:36 +0000 Subject: [PATCH] Don't discard server messages --- core/bot.py | 8 ++++---- utils/dedup.py | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/bot.py b/core/bot.py index fce82c8..bd3743f 100644 --- a/core/bot.py +++ b/core/bot.py @@ -220,10 +220,10 @@ class IRCBot(IRCClient): # remove server stuff if "muser" in cast.keys(): if cast["muser"] == self.servername: - return + cast["type"] = "conn" if "channel" in cast.keys(): if cast["channel"] == "*": - return + cast["type"] = "conn" ## # expand out the hostmask @@ -254,7 +254,7 @@ class IRCBot(IRCClient): # don't reprocess the same message twice # if the type is in that list, it's already been here, don't run it again - if not cast["type"] in {"query", "self", "highlight", "znc", "who"}: + if not cast["type"] in {"query", "self", "highlight", "znc", "who", "conn"}: cast["num"] = self.num if "channel" in cast.keys(): if cast["type"] == "mode": @@ -279,7 +279,7 @@ class IRCBot(IRCClient): # TODO: better way to do this # as we changed the types above, check again - if not cast["type"] in {"query", "self", "highlight", "znc", "who"}: + if not cast["type"] in {"query", "self", "highlight", "znc", "who", "conn"}: # we have been kicked if "user" in cast.keys(): if cast["user"].lower() == self.nickname.lower(): diff --git a/utils/dedup.py b/utils/dedup.py index 6746112..a5c3c45 100644 --- a/utils/dedup.py +++ b/utils/dedup.py @@ -6,8 +6,6 @@ import main from utils.logging.debug import debug def dedup(numName, b): - if b["type"] in ["quit", "nick"]: - return False # QUITs and NICKs can't be duplicated, they are global and duplications are likely c = deepcopy(b) if "time" in c.keys(): del c["time"]