Skip to content

Commit c005b7f

Browse files
Niloth-ptimabbott
authored andcommitted
model: Convert reaction events to message reactions schema.
1 parent 9c7b36c commit c005b7f

File tree

1 file changed

+21
-11
lines changed

1 file changed

+21
-11
lines changed

zulipterminal/model.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,18 +1835,28 @@ def _handle_reaction_event(self, event: Event) -> None:
18351835
if message_id in self.index["messages"]:
18361836
message = self.index["messages"][message_id]
18371837
if event["op"] == "add":
1838-
message["reactions"].append(
1839-
{
1840-
key: event.get(key)
1841-
for key in [
1842-
"user",
1843-
"reaction_type",
1844-
"emoji_code",
1845-
"emoji_name",
1846-
"user_id",
1847-
]
1838+
reactions_entry = {
1839+
key: event.get(key)
1840+
for key in [
1841+
"user",
1842+
"reaction_type",
1843+
"emoji_code",
1844+
"emoji_name",
1845+
"user_id",
1846+
]
1847+
}
1848+
1849+
# Convert from reaction event schema to message reactions schema
1850+
if isinstance(event.get("user"), dict) and isinstance(
1851+
reactions_entry["user"], dict
1852+
):
1853+
reactions_entry["user"] = {
1854+
**event["user"],
1855+
"id": event["user"].get("user_id"),
18481856
}
1849-
)
1857+
reactions_entry["user"].pop("user_id", None)
1858+
1859+
message["reactions"].append(reactions_entry)
18501860
else:
18511861
for reaction in message["reactions"]:
18521862
reaction_user_id = (

0 commit comments

Comments
 (0)