Philipp Hörist pushed to branch master at gajim / gajim
Commits:
4f43bf2e by Philipp Hörist at 2024-05-21T12:31:04+02:00
cfix: Message: Fallback to message-id if origin-id is not available
Fixes #11837
- - - - -
134601e2 by Philipp Hörist at 2024-05-21T12:31:37+02:00
cfix: Reactions: Display emojis always with emoji presentation
- - - - -
2 changed files:
- gajim/common/modules/message.py
- gajim/gtk/conversation/reactions_bar.py
Changes:
=====================================
gajim/common/modules/message.py
=====================================
@@ -143,7 +143,10 @@ def _message_received(self,
self._log.debug('Generating id for message')
stanza_id = self._get_stanza_id(properties)
- origin_id = properties.origin_id
+
+ # Fallback to message-id in case the MUC strips origin-id
+ # https://dev.gajim.org/gajim/gajim/-/issues/11837
+ origin_id = properties.origin_id or properties.id
if (m_type in (MessageType.CHAT, MessageType.PM) and
direction == ChatDirection.OUTGOING and
=====================================
gajim/gtk/conversation/reactions_bar.py
=====================================
@@ -160,7 +160,9 @@ def __init__(self, emoji: str, reaction_data:
list[ReactionData]) -> None:
if self.from_us:
self.get_style_context().add_class('reaction-from-us')
- emoji_label = Gtk.Label(label=emoji)
+ # Add emoji presentation selector, otherwise depending on the font
+ # emojis might be displayed in its text variant
+ emoji_label = Gtk.Label(label=f'{emoji}\uFE0F')
count_label = Gtk.Label(label=str(len(reaction_data)))
count_label.get_style_context().add_class('monospace')
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/55d904c18bd049b42042732d55d24f3e479f39f4...134601e22328abe99e6b21548adf35439a55db44
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/55d904c18bd049b42042732d55d24f3e479f39f4...134601e22328abe99e6b21548adf35439a55db44
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- commits@gajim.org
To unsubscribe send an email to commits-le...@gajim.org
