Merge branch 'master' into kate

stdplugins/snip.py

@@ -1,9 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+import asyncio
 from telethon import events, utils
 from telethon.tl import types
 
+loop = asyncio.get_event_loop()
 
 TYPE_TEXT = 0
 TYPE_PHOTO = 1
@@ -16,10 +18,11 @@ snips = storage.snips or {}
 
 @borg.on(events.NewMessage(pattern=r'\.snip (\S+)', outgoing=True))
 async def on_snip(event):
+    loop.create_task(event.delete())
     name = event.pattern_match.group(1)
     if name not in snips:
-        await on_snip_save(event)
-    else:
+        return
+
     snip = snips[name]
     if snip['type'] == TYPE_PHOTO:
         media = types.InputPhoto(snip['id'], snip['hash'], file_reference=b'')
@@ -32,14 +35,15 @@ async def on_snip(event):
                             file=media,
                             reply_to=event.message.reply_to_msg_id)
 
-    await event.delete()
-
 
 @borg.on(events.NewMessage(pattern=r'\.snips (\S+)', outgoing=True))
 async def on_snip_save(event):
+    loop.create_task(event.delete())
     name = event.pattern_match.group(1)
     msg = await event.get_reply_message()
-    if msg:
+    if not msg:
+        return
+
     snips.pop(name, None)
     snip = {'type': TYPE_TEXT, 'text': msg.message or ''}
     if msg.media:
@@ -57,27 +61,24 @@ async def on_snip_save(event):
     snips[name] = snip
     storage.snips = snips
 
-    await event.delete()
-
 
 @borg.on(events.NewMessage(pattern=r'\.snipl', outgoing=True))
 async def on_snip_list(event):
+    loop.create_task(event.delete())
     await event.respond('available snips: ' + ', '.join(snips.keys()))
-    await event.delete()
 
 
 @borg.on(events.NewMessage(pattern=r'\.snipd (\S+)', outgoing=True))
 async def on_snip_delete(event):
+    loop.create_task(event.delete())
     snips.pop(event.pattern_match.group(1), None)
     storage.snips = snips
-    await event.delete()
 
 
 @borg.on(events.NewMessage(pattern=r'\.snipr (\S+)\s+(\S+)', outgoing=True))
 async def on_snip_rename(event):
+    loop.create_task(event.delete())
     snip = snips.pop(event.pattern_match.group(1), None)
     if snip:
         snips[event.pattern_match.group(2)] = snip
         storage.snips = snips
-
-    await event.delete()