bugfixes on datetimes due to python version changes (?), debug gif plugin not handling when no gif is returned. Add sudo plugin because the funny

Author: lagaffe

README.md

@@ -10,6 +10,7 @@ docker build -t lechebot .
 # pour usage rapide:
 # --rm le docker est supr au moment de le stop
 docker run --rm lechebot
+docker run -it --rm lechebot bash # run bash to manually start lechbot and choose comand line options
 ```
 
 ## Installation en local
@@ -26,6 +27,16 @@ $ pip install -r requirements.txt
 Create a file called local_config.py (in the same directory as config.py), and edit config values as needed.
 In order to test the bot locally, you might be interested in runnning an instance of [UrLab's Incubator](https://github.com/UrLab/incubator).
 
+to use the sudo plugin you need to add a sudoers.json files in the data/
+
+sudoers.json:
+```json
+{
+    "users": []
+}
+```
+with the user names of the sudoers in the users array (you can allways add some later using the bot command or modifying the file)
+
 ### Test in command line only
 
 `$ python lechbot.py [ --debug ]`

chanconfig.py

@@ -14,10 +14,12 @@
     Trump,
     Twitter,
     UrlShow,
+    Sudo
 )
 
 CHANS = {
     "#urlab": [
+        Sudo(),
         Ascii(),
         Topic(),
         Space(),
@@ -34,6 +36,7 @@
         Trump(),
     ],
     "#titoufaitdestests": [
+        Sudo(),
         Ascii(),
         Topic(),
         Space(),

config.py

@@ -12,7 +12,7 @@
 BRIDGE_BOTS = ["LeBID"]
 
 # Url to Incubator
-INCUBATOR = "http://localhost:8000/"
+INCUBATOR = "https://urlab.be/"
 
 # Secret string to perform private API calls to incubator.
 # Go to [INCUBATOR]/admin/space/privateapikey/ to obtain one

data/.gitignore

@@ -0,0 +1 @@
+sudoers.json

ircbot/abstractbot.py

@@ -52,7 +52,6 @@ def reply(self, text, private=False, hilight=False, strip_text=True):
             text = self.user + ": " + text
         self.bot.say(text, target=target, strip_text=strip_text)
 
-
 class AbstractBot:
     """
     Base class for all bots backends. Define the common behaviour for the bot,
@@ -99,7 +98,7 @@ def __init__(
         :type local_only: bool
 
         :example:
-            >>> Bot("Bot", {'#chan': AwesomePlugin()})
+            >>> Bot("Bot", {'#chan': [AwesomePlugin()]})
         """
         self.main_chan = main_chan
         self.nickname = nickname
@@ -118,6 +117,7 @@ def __init__(
                     chans[chan][k] = chans[chan].get(k, []) + list(v)
         self.channels = chans
         self.log = logging.getLogger(__name__)
+        
 
     def spawn(self, maybe_coroutine):
         """
@@ -141,7 +141,7 @@ def connect(self, **kwargs):
                 self.spawn(callback())
         return self
 
-    def feed(self, user, target, text):
+    def feed(self, user, target, text, sudo=False):
         """
         Feed a new message into the bot
 
@@ -155,18 +155,27 @@ def feed(self, user, target, text):
         # First check if the message was sent over a bridge by a bot.
         # If this is the case, extract the original author and text that was
         # sent on the other side of the bridge, and use them as user and text
+
         if user in self.bridge_bots:
-            match = re.match(r"^\s*<\s*([^>]+)\s*>\s*(.+)", text)
+            self.log.debug("msg from bridge")
+            match = re.match(r"^\s*\[\s*([^>]+)\s*\]\s*(.+)", text)
             if match:
+                self.log.debug("command from bridge" + user)
                 user = match.group(1)
                 text = match.group(2)
+            
 
         target = target.lower()
         is_query = target[0] == "#"
+        commands = []
         if is_query:
-            commands = self.channels.get(target, {}).get("commands", [])
+            channel_callbacks = self.channels.get(target, {})
+            commands = channel_callbacks.get("commands", [])
+            if sudo:
+                commands.extend(channel_callbacks.get("sudo_commands", []))
         else:
             commands = self.channels.get("query", {}).get("commands", [])
+
         for (pattern, callback) in commands:
             match = pattern.match(text)
             if match:

ircbot/plugin.py

@@ -10,17 +10,22 @@ def load(self, bot, chan):
         self.chan = chan
         callbacks = {
             "commands": [],
+            "sudo_commands": [],
             "on_join": [],
             "on_connect": [],
         }
         for member in map(partial(getattr, self), dir(self)):
             if hasattr(member, "_botplugin_special_tag_pattern"):
                 pattern = member._botplugin_special_tag_pattern
-                callbacks["commands"].append((re.compile(pattern), member))
+                if hasattr(member, "_need_sudo") and member._need_sudo:
+                    callbacks["sudo_commands"].append((re.compile(pattern), member))
+                else:                
+                    callbacks["commands"].append((re.compile(pattern), member))
             elif hasattr(member, "_botplugin_special_tag_onjoin"):
                 callbacks["on_join"].append(member)
             elif hasattr(member, "_botplugin_special_tag_onconnect"):
                 callbacks["on_connect"].append(member)
+                
         callbacks["commands"].sort(key=lambda P: P[1]._special_tag_id)
         return callbacks
 
@@ -31,7 +36,7 @@ def set_topic(self, text):
         self.bot.set_topic(text, target=self.chan)
 
     @classmethod
-    def command(cls, pattern):
+    def command(cls, pattern, need_sudo=False):
         cls.comment_tag_id += 1
         # Here's the trick. We keep a static id, which is incremented any time
         # we declare a new command, so that we know in which order they have
@@ -41,6 +46,7 @@ def command(cls, pattern):
         def wrapper(func):
             func._botplugin_special_tag_pattern = pattern
             func._special_tag_id = cls.comment_tag_id
+            func._need_sudo = need_sudo
             return func
 
         return wrapper

plugins/__init__.py

@@ -11,3 +11,4 @@
 from .trump import Trump
 from .twitter import Twitter
 from .urls import UrlShow
+from .sudo import Sudo

plugins/giphy.py

@@ -6,9 +6,11 @@
 from .helpers import public_api
 
 
+
 class Giphy(BotPlugin):
     def __init__(self, giphy_key):
         self.giphy_key = giphy_key
+        self.default_gif = "https://media1.giphy.com/media/v1.Y2lkPTc5MGI3NjExbHplbzc4MjQ2MDRjemcxMDZ3dXhvc3N3aTBodW9lcGt6am9iNzYwNyZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/tHIRLHtNwxpjIFqPdV/giphy.gif"
 
     def clean_url(self, url):
         m = re.match(r"^(https://.+/giphy\.gif).*", url)
@@ -20,7 +22,12 @@ async def search_gif(self, query):
         url = "http://api.giphy.com/v1/gifs/search?api_key={}&q={}"
         q = query.replace(" ", "+")
         r = await public_api(url.format(self.giphy_key, q))
-        chosen = random.choice(r["data"])
+        gif_data = r["data"]
+        
+        if not gif_data:
+            return self.default_gif
+        
+        chosen = random.choice(gif_data)
         return self.clean_url(chosen["images"]["original"]["url"])
 
     @BotPlugin.command(r"\!gif (#[\w\d_-]+) (.+)")

plugins/helpers.py

@@ -88,7 +88,7 @@ async def public_api(endpoint):
 
 
 async def spaceapi():
-    return public_api(SPACEAPI)
+    return await public_api(SPACEAPI)
 
 
 async def full_pamela():

plugins/reminder.py

@@ -1,6 +1,6 @@
 import asyncio
 import random
-from datetime import datetime
+from datetime import datetime, timezone
 from operator import itemgetter
 from time import time
 
@@ -55,7 +55,7 @@ async def remind_events(self):
         Rappelle les évènements proches
         """
         events = await public_api("/events/")
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
 
         for event in events["results"]:
             if not event.get("start", None):