Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-01-07 21:58:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Simplify the room send logic.

Browse Source
This commit is contained in:
Damir Jelić 2019-05-14 13:52:55 +02:00
parent bfd7144b4f
commit 2151f55337
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pantalaimon/daemon.py
View File

@ -14,7 +14,7 @@ from aiohttp.client_exceptions import (ContentTypeError,
ClientConnectionError)
from multidict import CIMultiDict
from nio import (EncryptionError, GroupEncryptionError, LoginResponse,
MembersSyncError)
SendRetryError)
from pantalaimon.client import PanClient
from pantalaimon.log import logger
@ -31,10 +31,6 @@ from pantalaimon.thread_messages import (
)
class SendError(Exception):
pass
@attr.s
class ProxyDaemon:
name = attr.ib()
@ -620,24 +616,6 @@ class ProxyDaemon:
body=await response.read()
)
async def _send_message(self, client, room_id, msgtype, content, txnid):
"""Send a room message, fetch room members and share group sessions."""
retries = 5
for i in range(retries):
try:
return await client.room_send(room_id, msgtype, content, txnid)
except GroupEncryptionError:
await client.share_group_session(room_id)
except MembersSyncError:
await client.joined_members(room_id)
if client.should_query_keys:
keys_query_response = await client.keys_query()
await client.keys_query_cb(keys_query_response)
raise SendError("Service Unavailable")
async def send_message(self, request):
access_token = self.get_access_token(request)
@ -672,11 +650,10 @@ class ProxyDaemon:
return self._not_json
try:
response = await self._send_message(client, room_id, msgtype,
content, txnid)
response = await client.room_send(room_id, msgtype, content, txnid)
except ClientConnectionError as e:
return web.Response(status=500, text=str(e))
except SendError as e:
except SendRetryError as e:
return web.Response(status=503, text=str(e))
return web.Response(