Merge pull request #196 from UnifierHQ/dev

3.8.1: Quick fix

cogs/bridge.py

@@ -1392,7 +1392,7 @@ async def delete_copies(self, message):
 
         roomdata = self.get_room(msg.room)
 
-        if not roomdata['meta']['settings'].get('relay_delete'):
+        if not roomdata['meta']['settings'].get('relay_delete', True):
             return 0
 
         threads = []
@@ -1772,7 +1772,7 @@ async def edit(self, message, content):
 
         roomdata = self.get_room(msg.room)
 
-        if not roomdata['meta']['settings'].get('relay_edit', True):
+        if not roomdata['meta']['settings'].get('relay_edits', True):
             return
 
         async def edit_discord(msgs,friendly=False):
@@ -2919,7 +2919,7 @@ async def tbsend(msg_author,url,color,useremoji,reply,content, files, destguild)
                             continue
                         raise
 
-                    if result[1]:
+                    if len(result) > 2 and result[1]:
                         urls.update(result[1])
 
                     message_ids.update(result[0])
@@ -6407,7 +6407,7 @@ async def on_message_edit(self, before, after):
 
         try:
             roomdata = self.bot.bridge.get_room(roomname)
-            if not roomdata['meta']['relay_edits']:
+            if not roomdata['meta']['settings'].get('relay_edits', True):
                 return
 
             if not self.bot.config['enable_logging'] or not self.bot.config['logging_edit'] or roomdata['meta']['private']:
@@ -6502,7 +6502,7 @@ async def on_raw_message_edit(self,payload):
                 return
 
             roomdata = self.bot.bridge.get_room(roomname)
-            if not roomdata['meta']['relay_edits']:
+            if not roomdata['meta']['settings'].get('relay_edits', True):
                 return
 
             try:

cogs/sysmgr.py

@@ -2027,7 +2027,9 @@ async def upgrade(self, ctx, plugin='system', *, args=''):
                 })
 
                 if not bootdata['stable_branch'] == self.bot.config['branch']:
-                    embed.description += '\n\n' + self.bot.ui_emojis.warning + ' ' + selector.get('unstable')
+                    embed.description += '\n\n' + self.bot.ui_emojis.warning + ' ' + selector.fget(
+                        'unstable', values={'branch': self.bot.config['branch']}
+                    )
 
                 embed.remove_footer()
                 embed.colour = 0xffcc00

plugins/system.json

@@ -2,8 +2,8 @@
   "id": "system",
   "name": "System extensions",
   "description": "Unifier system extensions",
-  "version": "v3.8.0",
-  "release": 139,
+  "version": "v3.8.1",
+  "release": 140,
   "reboot": 138,
   "minimum": 0,
   "shutdown": false,

release-notes/v3.8.1.md

@@ -0,0 +1,5 @@
+A quick bugfix for 3.8.0.
+
+## 🔧 Bug fixes and other improvements
+- Fixed message deletes not relaying properly
+- Fixed some errors in the console