Add new MOTD handling commands

Revamp the ~motd command so that it supports the following subcommands
on the newly-introduced array of MOTD messages:

~motd add... (equivalent to old ~motd): adds a message
~motd clean (equivalent to old ~cleanmotd
~motd del n (to suppress message #n)
~motd reorder x y z (to reorder/remove messages)

Change-Id: I2f98c724c716ca4fd2e8fef34d4ca5af457b39e8

README.rst

@@ -214,12 +214,19 @@ You have to be a channel operator (+o) to use admin commands.
   Removes existing now/next/location/presence entries. This command is
   meant to be run at the start of a new day
 
-~motd LEVEL MESSAGE
+~motd add LEVEL MESSAGE
   Adds a message of the day on top of the rendered page. Level must be one of
-  info, success, warning or danger.
+  info, success, warning or danger. Multiple messages can be provided.
 
-~cleanmotd
-  Removes message of the day on top of the rendered page.
+~motd del N
+  Removes Nth message from the top of the page (first message is number 1).
+
+~motd reorder X Y...
+  Reorder messages. For example, ~motd reorder 2 1 would swap the top two
+  messages, and remove any other message present.
+
+~motd clean
+  Removes all messages of the day on top of the rendered page.
 
 ~emptydb
   Resets the database entirely to minimal contents

ptgbot/bot.py

@@ -371,13 +371,73 @@ class PTGBot(SASL, SSL, irc.bot.SingleServerIRCBot):
                     self.send(chan, "Error loading DB: %s" % e)
             elif command == 'newday':
                 self.data.new_day_cleanup()
+
             elif command == 'motd':
-                if len(words) < 3:
-                    self.send(chan, "Not enough params (~motd LEVEL MESSAGE)")
+                if len(words) < 2:
+                    self.send(
+                        chan,
+                        "Missing subcommand (~motd add|del|clean|reorder ...)"
+                    )
                     return
-                self.data.motd(words[1], str.join(' ', words[2:]))
-            elif command == 'cleanmotd':
-                self.data.clean_motd()
+                if words[1] == "add":
+                    if len(words) < 4:
+                        self.send(
+                            chan,
+                            "Missing parameters (~motd add LEVEL MSG)"
+                        )
+                        return
+                    if words[2] not in [
+                        'info', 'success', 'warning', 'danger'
+                    ]:
+                        self.send(
+                            chan,
+                            "Incorrect message level '%s' (should be info, "
+                            "success, warning or danger)" % words[2]
+                        )
+                        return
+                    self.data.motd_add(words[2], str.join(' ', words[3:]))
+                elif words[1] == "del":
+                    if len(words) < 3:
+                        self.send(
+                            chan,
+                            "Missing message number (~motd del NUM)"
+                        )
+                        return
+                    if not self.data.motd_has(words[2]):
+                        self.send(
+                            chan,
+                            "Incorrect message number %s" % words[2]
+                        )
+                        return
+                    self.data.motd_del(words[2])
+                elif words[1] == "clean":
+                    if len(words) > 2:
+                        self.send(
+                            chan,
+                            "'~motd clean' does not take parameters"
+                        )
+                        return
+                    self.data.motd_clean()
+                elif words[1] == "reorder":
+                    if len(words) < 3:
+                        self.send(
+                            chan,
+                            "Missing params (~motd reorder X Y...)"
+                        )
+                        return
+                    order = []
+                    for num in words[2:]:
+                        if not self.data.motd_has(num):
+                            self.send(
+                                chan,
+                                "Incorrect message number %s" % num
+                            )
+                            return
+                        order.append(num)
+                    self.data.motd_reorder(order)
+                else:
+                    self.send(chan, "Unknown motd subcommand %s" % words[1])
+
             elif command == 'requirevoice':
                 self.data.require_voice()
             elif command == 'alloweveryone':

ptgbot/db.py

@@ -220,21 +220,38 @@ class PTGDataBase():
         self.data['next'] = OrderedDict()
         self.data['location'] = OrderedDict()
         self.data['last_check_in'] = OrderedDict()
-        self.clean_motd()
+        self.save()
 
     def empty(self):
         self.data = copy.deepcopy(self.BASE)
         self.save()
 
-    def motd(self, level, message):
-        if level in ['info', 'success', 'warning', 'danger']:
-            self.data['motd'] = [{'level': level, 'message': message}]
-            self.save()
+    def motd_has(self, num):
+        try:
+            n = int(num)
+            return n > 0 and len(self.data['motd']) >= n
+        except ValueError:
+            return False
 
-    def clean_motd(self):
+    def motd_add(self, level, message):
+        self.data['motd'].append({'level': level, 'message': message})
+        self.save()
+
+    def motd_del(self, num):
+        del(self.data['motd'][int(num) - 1])
+        self.save()
+
+    def motd_clean(self):
         self.data['motd'] = []
         self.save()
 
+    def motd_reorder(self, order):
+        new = []
+        for index in order:
+            new.append(self.data['motd'][int(index) - 1])
+        self.data['motd'] = new
+        self.save()
+
     def _blank_check_in(self):
         # No need for a copy here
         return OrderedDict(self.BASE_CHECK_IN)