new ircbot interface; still some stuff to figure out

aocrr_bot.py

@@ -6,8 +6,7 @@ import sys
 from datetime import datetime, timedelta
 from time import sleep
 from tools.datafiles import JSONFile
-from tools.irc import Client, ServerMessage
+from tools.irc import IrcBot, ServerMessage
-from tools.schedule import Scheduler
 from tools.tools import human_readable_time_from_delta
 
 # IRC_SERVER = "irc.eu.libera.chat"
@@ -20,7 +19,7 @@ IRC_USER = "aocrr-bot"
 IRC_REALNAME = "#aocrr Leaderboard Announcer"
 
 
-def fetch_leaderboard(session_id: str, year: int = datetime.now().year) -> dict:
+def fetch_leaderboard(year: int = datetime.now().year) -> dict:
     return json.loads(
         requests.get(
             "https://adventofcode.com/%d/leaderboard/private/view/711147.json" % year,
@@ -29,111 +28,103 @@ def fetch_leaderboard(session_id: str, year: int = datetime.now().year) -> dict:
     )
 
 
-class IrcBot:
+def command_info(msg_from: str, message: str):
-    def __init__(self):
+    ircbot.privmsg(
-        self.cache = JSONFile("aocrr_bot.cache", create=True)
+        msg_from,
-        self.__session_id = open(".session", "r").readlines()[0].strip()
+        "I am %s => %s" % (ircbot.getUser().nickname, ircbot.getUser().user)
-        self.irc_client = Client(IRC_SERVER, IRC_PORT, IRC_NICK, IRC_USER, IRC_REALNAME)
-        self.irc_client.join(IRC_CHANNEL)
-        self.irc_client.subscribe(ServerMessage.MSG_PRIVMSG, self.on_privmsg)
-        self.irc_client.subscribe(ServerMessage.RAW, self.on_raw)
-        self.update_leaderboard()
-        self.scheduler = Scheduler()
-        self.scheduler.schedule('leaderboard', timedelta(minutes=15), self.update_leaderboard)
-
-    def on_privmsg(self, msg_from: str, msg_to: str, message: str):
-        if msg_to != IRC_CHANNEL:
-            return
-
-        if message.startswith("!info"):
-            self.irc_client.privmsg(
-                IRC_CHANNEL,
-                "I am %s => %s" % (self.irc_client.getUser().nickname, self.irc_client.getUser().user)
     )
-            self.irc_client.privmsg(IRC_CHANNEL, "I am currently in the following channels:")
+    ircbot.privmsg(msg_from, "I am currently in the following channels:")
-            for c in self.irc_client.getChannelList():
+    for c in ircbot.getChannelList():
-                self.irc_client.privmsg(IRC_CHANNEL, "%s => %s" % (c.name, c.topic))
+        ircbot.privmsg(msg_from, "%s => %s" % (c.name, c.topic))
-        elif message.startswith("!today"):
+
+
+def command_today(msg_from: str, message: str):
     today = str(datetime.now().day)
     day_start = datetime.today().replace(hour=6, minute=0, second=0)
 
     today_list = []
-            for member, member_data in self.cache.items():
+    for member, member_data in cache.items():
         if not member.startswith("__") and 'days' in member_data and today in member_data['days']:
             today_list.append(member)
 
-            self.irc_client.privmsg(
+    ircbot.privmsg(
         IRC_CHANNEL,
-                "Todays leaderboard (last updated: %s):" % self.cache['__last_update__']
+        "Todays leaderboard (last updated: %s):" % cache['__last_update__']
     )
-            for i, member in enumerate(sorted(today_list, key=lambda x: self.cache[x]['days'][today]['score'], reverse=True)):
+    for i, member in enumerate(sorted(today_list, key=lambda x: cache[x]['days'][today]['score'], reverse=True)):
         if i > 3:
             sleep(1)  # don't flood
 
-                if "1" in self.cache[member]['days'][today]:
+        if "1" in cache[member]['days'][today]:
             p1_time = "in " + human_readable_time_from_delta(
-                        datetime.fromisoformat(self.cache[member]['days'][today]['1']) - day_start
+                datetime.fromisoformat(cache[member]['days'][today]['1']) - day_start
             )
         else:
             p1_time = "not yet solved"
 
-                if "2" in self.cache[member]['days'][today]:
+        if "2" in cache[member]['days'][today]:
             p2_time = "in " + human_readable_time_from_delta(
-                        datetime.fromisoformat(self.cache[member]['days'][today]['2']) - day_start
+                datetime.fromisoformat(cache[member]['days'][today]['2']) - day_start
             )
         else:
             p2_time = "not yet solved"
 
-                self.irc_client.privmsg(
+        ircbot.privmsg(
             IRC_CHANNEL,
             "%d) %s (Scores: total: %d, today: %d) p1 %s, p2 %s"
             % (
                 i + 1,
-                        self.cache[member]['name'],
+                cache[member]['name'],
-                        self.cache[member]['score'],
+                cache[member]['score'],
-                        self.cache[member]['days'][today]['score'],
+                cache[member]['days'][today]['score'],
                 p1_time,
                 p2_time
             )
         )
-        elif message.startswith("!quit") and (msg_from.startswith("stha!") or msg_from.startswith("Pennywise!")):
+
-            self.irc_client.privmsg(IRC_CHANNEL, "Oh, ok ... bye :'(")
+
-            self.irc_client.quit()
+def command_quit(msg_from: str, message: str):
+    if msg_from.startswith("stha!") or msg_from.startswith("Pennywise!"):
+        ircbot.privmsg(msg_from, "Oh, ok ... bye :'(")
+        ircbot.quit()
         sys.exit(0)
 
-    def on_raw(self, msg_from: str, msg_type: str, msg_to: str, message: str):
+
+def on_raw(msg_from: str, msg_type: str, msg_to: str, message: str):
     print("[%s] <%s> (%s) -> <%s>: %s" % (datetime.now().strftime("%H:%M:%S"), msg_from, msg_type, msg_to, message))
 
-    def calc_scores(self):
+
-        member_count = len([x for x in self.cache.keys() if not x.startswith("__")])
+def calc_scores():
+    member_count = len([x for x in cache.keys() if not x.startswith("__")])
     for day in map(str, range(1, 26)):
         p1_times = []
         p2_times = []
-            for member, member_data in self.cache.items():
+        for member, member_data in cache.items():
             if member.startswith("__") or day not in member_data['days']:
                 continue
 
-                self.cache[member]['days'][day]['score'] = 0
+            cache[member]['days'][day]['score'] = 0
             if '1' in member_data['days'][day]:
                 p1_times.append(member_data['days'][day]['1'])
             if '2' in member_data['days'][day]:
                 p2_times.append(member_data['days'][day]['2'])
 
-            for member, member_data in self.cache.items():
+        for member, member_data in cache.items():
             if member.startswith("__") or day not in member_data['days']:
                 continue
 
             if '1' in member_data['days'][day] and member_data['days'][day]['1'] in p1_times:
                 score = member_count - sorted(p1_times).index(member_data['days'][day]['1'])
-                    self.cache[member]['days'][day]['score'] += score
+                cache[member]['days'][day]['score'] += score
 
             if '2' in member_data['days'][day] and member_data['days'][day]['2'] in p2_times:
                 score = member_count - sorted(p2_times).index(member_data['days'][day]['2'])
-                    self.cache[member]['days'][day]['score'] += score
+                cache[member]['days'][day]['score'] += score
 
-    def update_leaderboard(self):
+
+def update_leaderboard():
     try:
-            new_leaderboard = fetch_leaderboard(self.__session_id)
+        new_leaderboard = fetch_leaderboard()
     except:
         return  # didn't work this time? Well, we'll just try again in 15min ...
 
@@ -141,22 +132,22 @@ class IrcBot:
 
     new_stars = {}
     for member, member_data in new_leaderboard['members'].items():
-            if member not in self.cache:
+        if member not in cache:
-                self.cache[member] = {
+            cache[member] = {
                 'name': member_data['name'],
                 'days': {},
             }
 
-            self.cache[member]['global_score'] = int(member_data['global_score'])
+        cache[member]['global_score'] = int(member_data['global_score'])
-            self.cache[member]['score'] = int(member_data['local_score'])
+        cache[member]['score'] = int(member_data['local_score'])
-            self.cache[member]['stars'] = int(member_data['stars'])
+        cache[member]['stars'] = int(member_data['stars'])
         for day in member_data['completion_day_level']:
             day_start = datetime(now.year, 12, int(day), 6, 0, 0)
-                if day not in self.cache[member]['days']:
+            if day not in cache[member]['days']:
-                    self.cache[member]['days'][day] = {}
+                cache[member]['days'][day] = {}
 
             for part in member_data['completion_day_level'][day]:
-                    if part not in self.cache[member]['days'][day]:
+                if part not in cache[member]['days'][day]:
                     completion_time = datetime.fromtimestamp(
                         member_data['completion_day_level'][day][part]['get_star_ts']
                     )
@@ -165,10 +156,10 @@ class IrcBot:
 
                     finishing_time = human_readable_time_from_delta(completion_time - day_start)
                     new_stars[member_data['name']]['d' + day + 'p' + part] = finishing_time
-                        self.cache[member]['days'][day][part] = completion_time.isoformat()
+                    cache[member]['days'][day][part] = completion_time.isoformat()
 
     if len(new_stars) > 0:
-            self.irc_client.privmsg(IRC_CHANNEL, "New Stars found:")
+        ircbot.privmsg(IRC_CHANNEL, "New Stars found:")
         for member, parts in new_stars.items():
             line = member + ": "
             line += ", ".join(
@@ -176,19 +167,22 @@ class IrcBot:
                 % (part, new_stars[member][part]) for part in sorted(new_stars[member].keys())
             )
 
-                self.irc_client.privmsg(IRC_CHANNEL, line)
+            ircbot.privmsg(IRC_CHANNEL, line)
 
-        self.cache['__last_update__'] = datetime.now().isoformat()
+    cache['__last_update__'] = datetime.now().isoformat()
-        self.cache.save()
+    cache.save()
-        self.calc_scores()
+    calc_scores()
-
-    def run(self):
-        while 1:
-            self.scheduler.run_pending()
-            self.irc_client.receive()
-            sleep(0.1)
 
 
-if __name__ == '__main__':
+cache = JSONFile("aocrr_bot.cache", create=True)
-    ircbot = IrcBot()
+session_id = open(".session", "r").readlines()[0].strip()
+
+ircbot = IrcBot(IRC_SERVER, IRC_PORT, IRC_NICK, IRC_USER, IRC_REALNAME)
+ircbot.join(IRC_CHANNEL)
+ircbot.schedule('update_leaderboard', timedelta(minutes=15), update_leaderboard)
+ircbot.on(ServerMessage.RAW, on_raw)
+ircbot.register_channel_command("!info", IRC_CHANNEL, command_info)
+ircbot.register_channel_command("!today", IRC_CHANNEL, command_today)
+ircbot.register_privmsg_command("info", command_info)
+ircbot.register_privmsg_command("quit", command_quit)
 ircbot.run()