Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate _function for local echoing

Browse Source
This commit is contained in:
miruka 2019-10-28 13:49:55 -04:00
parent 09a50f8bc7
commit 662b60d7a8
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/python/matrix_client.py
View File

@ -180,13 +180,13 @@ class MatrixClient(nio.AsyncClient):
text = text[1:] text = text[1:]
if text.startswith("/me ") and not escape: if text.startswith("/me ") and not escape:
event_type = nio.RoomMessageEmote.__name__ event_type = nio.RoomMessageEmote
text = text[len("/me "): ] text = text[len("/me "): ]
content = {"body": text, "msgtype": "m.emote"} content = {"body": text, "msgtype": "m.emote"}
to_html = HTML_FILTER.from_markdown_inline(text, outgoing=True) to_html = HTML_FILTER.from_markdown_inline(text, outgoing=True)
echo_body = HTML_FILTER.from_markdown_inline(text) echo_body = HTML_FILTER.from_markdown_inline(text)
else: else:
event_type = nio.RoomMessageText.__name__ event_type = nio.RoomMessageText
content = {"body": text, "msgtype": "m.text"} content = {"body": text, "msgtype": "m.text"}
to_html = HTML_FILTER.from_markdown(text, outgoing=True) to_html = HTML_FILTER.from_markdown(text, outgoing=True)
echo_body = HTML_FILTER.from_markdown(text) echo_body = HTML_FILTER.from_markdown(text)
@ -196,11 +196,19 @@ class MatrixClient(nio.AsyncClient):
content["formatted_body"] = to_html content["formatted_body"] = to_html
uuid = str(uuid4()) uuid = str(uuid4())
self.local_echoes_uuid.add(uuid)
await self._local_echo(room_id, uuid, echo_body, event_type)
await self._send_message(room_id, uuid, content)
async def _local_echo(
self, room_id: str, uuid: str, content: str,
event_type: Type[nio.Event], **event_fields,
) -> None:
our_info = self.models[Member, room_id][self.user_id] our_info = self.models[Member, room_id][self.user_id]
local = Event( event = Event(
source = None, source = None,
client_id = f"echo-{uuid}", client_id = f"echo-{uuid}",
event_id = "", event_id = "",
@ -208,17 +216,19 @@ class MatrixClient(nio.AsyncClient):
sender_id = self.user_id, sender_id = self.user_id,
sender_name = our_info.display_name, sender_name = our_info.display_name,
sender_avatar = our_info.avatar_url, sender_avatar = our_info.avatar_url,
content = echo_body, content = content,
is_local_echo = True, is_local_echo = True,
local_event_type = event_type, local_event_type = event_type.__name__,
) )
self.local_echoes_uuid.add(uuid)
for user_id in self.models[Account]: for user_id in self.models[Account]:
if user_id in self.models[Member, room_id]: if user_id in self.models[Member, room_id]:
self.models[Event, user_id, room_id][f"echo-{uuid}"] = local self.models[Event, user_id, room_id][f"echo-{uuid}"] = event
self.models[Event, user_id, room_id].sync_now() self.models[Event, user_id, room_id].sync_now()
await self.set_room_last_event(room_id, local) await self.set_room_last_event(room_id, event)
await self._send_message(room_id, uuid, content)
async def _send_message(self, room_id: str, uuid: str, content: dict, async def _send_message(self, room_id: str, uuid: str, content: dict,