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

Fix displaying local echo html formatting

Browse Source
This commit is contained in:
miruka 2019-08-30 11:53:55 -04:00
parent aec83c66f3
commit 720eb78fe8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.md
View File

@ -12,7 +12,6 @@
- Fixes - Fixes
- Icons on KDE - Icons on KDE
- Greentext for local echo
- Show error if uploading avatar fails - Show error if uploading avatar fails

10
src/python/matrix_client.py
View File

@ -174,10 +174,12 @@ class MatrixClient(nio.AsyncClient):
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)
else: else:
event_type = nio.RoomMessageText.__name__ event_type = nio.RoomMessageText.__name__
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)
if to_html not in (html.escape(text), f"<p>{html.escape(text)}</p>"): if to_html not in (html.escape(text), f"<p>{html.escape(text)}</p>"):
content["format"] = "org.matrix.custom.html" content["format"] = "org.matrix.custom.html"
@ -186,16 +188,16 @@ class MatrixClient(nio.AsyncClient):
uuid = str(uuid4()) uuid = str(uuid4())
self.local_echoes_uuid.add(uuid) self.local_echoes_uuid.add(uuid)
our_info = self.models[Member, room_id][self.user_id] our_info = self.models[Member, room_id][self.user_id]
display_content = content.get("formatted_body") or content["body"] import remote_pdb; remote_pdb.RemotePdb("127.0.0.1", 4444).set_trace()
local = Event( local = Event(
source = None, source = None,
client_id = f"echo-{uuid}", client_id = f"echo-{uuid}",
event_id = "", event_id = "",
date = datetime.now(), date = datetime.now(),
content = display_content, content = echo_body,
inline_content = HTML_FILTER.filter_inline(display_content), inline_content = HTML_FILTER.filter_inline(echo_body),
is_local_echo = True, is_local_echo = True,
local_event_type = event_type, local_event_type = event_type,