Merge branch 'gonzobot' into gonzobot+fix-readme

Author: linuxdaemon

data/food/burger.json

@@ -75,26 +75,25 @@
             "sriracha aioli"
         ],
         "topping2": [
-           "crispy bacon strips",
-           "caramelized onions",
-           "fried onion straws",
-           "sauteed mushrooms",
-           "a fried egg",
-           "arugula",
-           "romaine lettuce"
-        ],    
+            "crispy bacon strips",
+            "caramelized onions",
+            "fried onion straws",
+            "sauteed mushrooms",
+            "a fried egg",
+            "arugula",
+            "romaine lettuce"
+        ],
         "side": [
-           "a side of fries tossed in parm and truffle oil",
-           "a side of sweet potato fries",
-           "a side of McDonald's fries",
-           "a side of curly fries",
-           "a side of thick-cut chips",
-           "a side of onion rings",
-           "side of sesame ginger coleslaw",
-           "side of macaroni and cheese",
-           "a large chilly soda",
-           "a cup of BBQ dip"
-        ]        
+            "a side of fries tossed in parm and truffle oil",
+            "a side of sweet potato fries",
+            "a side of McDonald's fries",
+            "a side of curly fries",
+            "a side of thick-cut chips",
+            "a side of onion rings",
+            "side of sesame ginger coleslaw",
+            "side of macaroni and cheese",
+            "a large chilly soda",
+            "a cup of BBQ dip"
+        ]
     }
 }
-

data/food/soup.json

@@ -15,7 +15,7 @@
             "Cazuela",
             "Chicken Noodle",
             "Cock-a-leekie",
-	    "Cream of crab",
+            "Cream of crab",
             "Fufu and Egusi",
             "Gomguk",
             "Goulash",
@@ -25,7 +25,7 @@
             "Lagman",
             "Leek",
             "Lentil",
-	    "Maryland crab",
+            "Maryland crab",
             "Matzah ball",
             "Menudo",
             "Minestrone",

data/reaction_macros.json

@@ -30,8 +30,8 @@
         "https://i.imgur.com/8VYMSq8.gif",
         "https://i.imgur.com/WVn7B8O.jpg",
         "https://i.imgur.com/GTxRRuv.gif"
-   ],
-   "head_desk_macros": [
+    ],
+    "head_desk_macros": [
         "https://i.imgur.com/Pg9nt.gif",
         "https://baudattitude.files.wordpress.com/2012/02/twilightsparkleheaddesk.gif",
         "https://i.imgur.com/LFzzTd8.gif",

plugins/chan_track.py

@@ -4,7 +4,10 @@
 Requires:
 server_info.py
 """
+import gc
 import weakref
+from collections import Mapping
+from contextlib import suppress
 from operator import attrgetter
 from weakref import WeakValueDictionary
 
@@ -105,6 +108,34 @@ def get_chan_data(bot):
             update_conn_data(conn)
 
 
+def clean_user_data(user):
+    for memb in user.get("channels", {}).values():
+        status = list(set(memb.get("status", [])))
+        status.sort(key=attrgetter("level"), reverse=True)
+        memb["status"] = status
+
+
+def clean_chan_data(chan):
+    with suppress(KeyError):
+        del chan["new_users"]
+
+    with suppress(KeyError):
+        del chan["receiving_names"]
+
+
+def clean_conn_data(conn):
+    for user in conn.memory.get("users", {}).values():
+        clean_user_data(user)
+
+    for chan in conn.memory.get("chan_data", {}).values():
+        clean_chan_data(chan)
+
+
+def clean_data(bot):
+    for conn in bot.connections.values():
+        clean_conn_data(conn)
+
+
 @hook.connect
 def init_chan_data(conn, _clear=True):
     chan_data = conn.memory.setdefault("chan_data", ChanDict())
@@ -158,15 +189,16 @@ def replace_user_data(conn, chan_data):
         nick = user_data["nick"]
         new_users[nick] = memb_data
         if nick in old_users:
-            old_data = old_users[nick]
+            old_data = old_users[nick]  # Old membership object
             old_data.update(memb_data)  # New data takes priority over old data
             memb_data.update(old_data)
 
         old_user_data = users.getuser(nick)
+        user_data["channels"] = old_user_data["channels"]
+        add_user_membership(user_data, chan_data["name"], memb_data)
         old_user_data.update(user_data)
         user_data = old_user_data
         memb_data["user"] = user_data
-        add_user_membership(user_data, chan_data["name"], memb_data)
 
     old_users.clear()
     old_users.update(new_users)  # Reassigning the dict would break other references to the data, so just update instead
@@ -201,7 +233,7 @@ def dump_dict(data, indent=2, level=0, _objects=None):
         yield ((" " * (indent * level)) + "{}:".format(key))
         if id(value) in _objects:
             yield ((" " * (indent * (level + 1))) + "[...]")
-        elif isinstance(value, dict):
+        elif isinstance(value, Mapping):
             _objects.append(id(value))
             yield from dump_dict(value, indent=indent, level=level + 1, _objects=_objects)
         else:
@@ -257,6 +289,20 @@ def updateusers(bot):
     return "Updating all channel data"
 
 
+@hook.command(permissions=["botcontrol"], autohelp=False)
+def cleanusers(bot):
+    clean_data(bot)
+    gc.collect()
+    return "Data cleaned."
+
+
+@hook.command(permissions=["botcontrol"], autohelp=False)
+def clearusers(bot):
+    init_chan_data(bot, True)
+    gc.collect()
+    return "Data cleared."
+
+
 @hook.irc_raw('JOIN')
 def on_join(nick, user, host, conn, irc_paramlist):
     chan, *other_data = irc_paramlist

travis/test_json.py

@@ -31,4 +31,5 @@
                 exit_code |= 2
                 print("Travis: {} is not a properly formatted JSON file".format(file))
 
-sys.exit(exit_code)
+if exit_code != 0:
+    sys.exit(exit_code)