1
0
Fork 0
mirror of https://github.com/myned/modufur.git synced 2024-11-01 13:02:38 +00:00

Merge branch 'dev'

This commit is contained in:
Myned 2018-05-10 18:38:20 -04:00
commit 5892a1eaf0

View file

@ -390,10 +390,12 @@ class MsG:
for future in done:
selection = future.result()
await match.delete()
with suppress(err.Forbidden):
await match.delete()
tempool = [pool for pool in pool_request if pool['name']
== pools[int(selection.content) - 1]][0]
await selection.delete()
with suppress(err.Forbidden):
await selection.delete()
elif pool_request:
tempool = pool_request[0]
else:
@ -638,10 +640,12 @@ class MsG:
for future in done:
selection = future.result()
await match.delete()
with suppress(err.Forbidden):
await match.delete()
tempool = [pool for pool in pool_request if pool['name']
== pools[int(selection.content) - 1]][0]
await selection.delete()
with suppress(err.Forbidden):
await selection.delete()
pool = {'name': tempool['name'], 'id': tempool['id']}
await destination.trigger_typing()