From 2bbc4c7dd5578eb2059b9e711c8be76b53ddb37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nikola@mraveniste.cc>
Date: Wed, 22 Aug 2018 11:21:23 +0200
Subject: [PATCH] Fix control user check

---
 rerunbot.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/rerunbot.py b/rerunbot.py
index d2ed7d1..c41253e 100644
--- a/rerunbot.py
+++ b/rerunbot.py
@@ -68,15 +68,15 @@ class ReplayBot(irc.bot.SingleServerIRCBot):
         message = ''.join([c for c in event.arguments[0] if not unicodedata.category(c).startswith('C')])
         message = message.rstrip()
         send_response = functools.partial(self._send_response, connection, event)
-        if int(tags['user-id']) != self.control_user:
-            send_response('Sorry @{0}, you are not allowed to do this'.format(tags['display-name']))
-            return
         for pattern, action in self.supported_commands:
             m = pattern.match(message)
             if m:
                 action(tags, send_response, **m.groupdict())
 
     def _do_load(self, tags, send_response, id, **kwargs):
+        if int(tags['user-id']) != self.control_user:
+            send_response('Sorry @{0}, you are not allowed to do this'.format(tags['display-name']))
+            return
         client_id = self.config['Twitch'].get('client_id')
         def get_comments(cursor):
             url = 'https://api.twitch.tv/v5/videos/{0}/comments'.format(id)
@@ -103,6 +103,9 @@ class ReplayBot(irc.bot.SingleServerIRCBot):
             send_response('@{0}: failed to load messages'.format(tags['display-name']))
 
     def _do_start(self, tags, send_response, **kwargs):
+        if int(tags['user-id']) != self.control_user:
+            send_response('Sorry @{0}, you are not allowed to do this'.format(tags['display-name']))
+            return
         now = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)
         for offset, user, msg in self.messages:
             def cb(user=user, msg=msg):
@@ -110,6 +113,9 @@ class ReplayBot(irc.bot.SingleServerIRCBot):
             self.reactor.scheduler.execute_at(now + offset, cb)
 
     def _do_stop(self, tags, send_response, **kwargs):
+        if int(tags['user-id']) != self.control_user:
+            send_response('Sorry @{0}, you are not allowed to do this'.format(tags['display-name']))
+            return
         self.reactor.scheduler.queue.clear()
 
     def _post_message(self, user, msg):