alemi/aioappsrv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

try fixing nested replies

Browse source
This commit is contained in:
git-bruh 2021-05-18 15:00:48 +05:30
parent eef7721153
commit f1ef46d37c
No known key found for this signature in database
GPG key ID: E1475C50075ADCE6
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appservice/discord.py
View file

@ -105,9 +105,9 @@ class Message:
User(mention) for mention in message.get("mentions", []) User(mention) for mention in message.get("mentions", [])
] ]
ref = message.get("message_reference") ref = message.get("referenced_message")
self.reference = dict_cls(ref, MessageReference) if ref else None self.referenced_message = Message(ref) if ref else None
author = message.get("author") author = message.get("author")

28
appservice/main.py
View file

@ -201,7 +201,7 @@ class MatrixClient(AppService):
message: str, message: str,
emotes: dict, emotes: dict,
edit: str = "", edit: str = "",
reference: discord.MessageReference = None, reference: discord.Message = None,
) -> dict: ) -> dict:
content = { content = {
"body": message, "body": message,
@ -210,37 +210,43 @@ class MatrixClient(AppService):
"formatted_body": self.get_fmt(message, emotes), "formatted_body": self.get_fmt(message, emotes),
} }
ref_id = None
if reference: if reference:
# Reply to a Discord message. # Reply to a Discord message.
with Cache.lock: with Cache.lock:
event_id = Cache.cache["d_messages"].get(reference.message_id) ref_id = Cache.cache["d_messages"].get(reference.id)
# Reply to a Matrix message. (maybe) # Reply to a Matrix message. (maybe)
if not event_id: if not ref_id:
with Cache.lock: with Cache.lock:
event_id = [ ref_id = [
k k
for k, v in Cache.cache["m_messages"].items() for k, v in Cache.cache["m_messages"].items()
if v == reference.message_id if v == reference.id
] ]
event_id = next(iter(event_id), "") ref_id = next(iter(ref_id), "")
if reference and event_id: # TODO use only the original event for replies, don't process ref.
# We do this as nested replies get messed up.
if ref_id:
event = except_deleted(self.get_event)( event = except_deleted(self.get_event)(
event_id, ref_id,
self.get_room_id(self.discord.matrixify(reference.channel_id)), self.get_room_id(self.discord.matrixify(reference.channel_id)),
) )
if event: if event:
r_content, r_emotes = self.discord.process_message(reference)
r_fmt = self.get_fmt(r_content, r_emotes)
content = { content = {
**content, **content,
"body": ( "body": (
f"> <{event.sender}> {event.body}\n{content['body']}" f"> <{event.sender}> {r_content}\n{content['body']}"
), ),
"m.relates_to": {"m.in_reply_to": {"event_id": event.id}}, "m.relates_to": {"m.in_reply_to": {"event_id": event.id}},
"formatted_body": f"""<mx-reply><blockquote>\ "formatted_body": f"""<mx-reply><blockquote>\
<a href="https://matrix.to/#/{event.room_id}/{event.id}">\ <a href="https://matrix.to/#/{event.room_id}/{event.id}">\
In reply to</a><a href="https://matrix.to/#/{event.sender}">\ In reply to</a><a href="https://matrix.to/#/{event.sender}">\
{event.sender}</a><br>{event.formatted_body}</blockquote></mx-reply>\ {event.sender}</a><br>{r_fmt}</blockquote></mx-reply>\
{content["formatted_body"]}""", {content["formatted_body"]}""",
} }
@ -517,7 +523,7 @@ class DiscordClient(Gateway):
content_, emotes = self.process_message(message) content_, emotes = self.process_message(message)
content = self.app.create_message_event( content = self.app.create_message_event(
content_, emotes, reference=message.reference content_, emotes, reference=message.referenced_message
) )
with Cache.lock: with Cache.lock: