bugfixes

rotbot/commands/common.py

@@ -126,9 +126,9 @@ class GameHelpers():
         total_actions = queries.get_user_total_actions(self, user.id)
         total_notices = queries.get_user_total_notices(self, user.id)
         total_cursewords_added = queries.get_user_total_cursewords_added(self, user.id)
-        total_curseadjectives_added = queries.get_user_total_curseadjectives_added(self, user.id)
+        total_curseadjectives_added = queries.get_user_total_adjectives_added(self, user.id)
         total_cursewords_banned = queries.get_user_total_cursewords_banned(self, user.id)
-        total_curseadjectives_banned = queries.get_user_total_curseadjectives_banned(self, user.id)
+        total_curseadjectives_banned = queries.get_user_total_adjectives_banned(self, user.id)
         gamestats = queries.get_user_gamestats(self, user.id)
         xp_spent = gamestats[0]
         level = gamestats[1]

rotbot/events/on_privnotice.py

@@ -53,6 +53,8 @@ def process_event(self, connection, event):
             return
         elif event.arguments[0].startswith("please choose a different nick."):
             return
+        elif event.arguments[0] == 'Password accepted - you are now recognized.':
+            return
     elif event.source.nick == "ChanServ":
         if event.arguments[0].startswith("Key for channel ") and len(event.arguments[0]) > 5:   # Received channel key.
             log.info('Saving channel password received from NickServ for: %s' % event.arguments[0].split(' ')[3])
@@ -70,6 +72,8 @@ def process_event(self, connection, event):
         #     return
     if event.source.nick != "Global":
         Inform.notice_owners(self, connection, 'Notice from %s%s%s: %s%s' % (font.red, event.source.nick, font.grey, font.reset, event.arguments[0]))
+    if event.arguments[0] == '*** Looking up your hostname...' or event.arguments[0] == '*** Found your hostname' or event.arguments[0].startswith('*** Connected securely via ') or event.arguments[0] == '*** Your host is masked (':
+        return  # Do not forward these messages.
 
 async def register_later(self, connection, seconds):
     await asyncio.sleep(seconds)