Philipp Hörist pushed to branch master at gajim / gajim
Commits:
a976eb56 by Philipp Hörist at 2025-10-21T12:36:37+02:00
refactor: Control: Simplify code around adding messages to the view
- - - - -
1 changed file:
- gajim/gtk/control.py
Changes:
=====================================
gajim/gtk/control.py
=====================================
@@ -199,7 +199,8 @@ def scroll_to_message(self, pk: int, timestamp:
dt.datetime) -> None:
messages = app.storage.archive.get_conversation_around_timestamp(
self._contact.account, self._contact.jid, timestamp
)
- self._add_messages(messages)
+ for message in messages:
+ self._add_message_from_storage(message)
self._scrolled_view.set_history_complete(False, False)
GLib.idle_add(self._scrolled_view.block_signals, False)
@@ -530,7 +531,6 @@ def _add_call_message(self, event:
events.JingleRequestReceived) -> None:
self._scrolled_view.add_call_message(event=event)
def _add_message(self, message: Message) -> None:
- # TODO: Unify with _add_db_row()
if self._allow_add_message():
self._scrolled_view.add_message_from_db(message)
@@ -542,7 +542,7 @@ def _add_message(self, message: Message) -> None:
else:
self._jump_to_end_button.add_unread_count()
- def _add_db_row(self, message: Message):
+ def _add_message_from_storage(self, message: Message):
if message.filetransfers:
self._scrolled_view.add_jingle_file_transfer(message=message)
return
@@ -553,10 +553,6 @@ def _add_db_row(self, message: Message):
self._scrolled_view.add_message_from_db(message)
- def _add_messages(self, messages: list[Message]):
- for msg in messages:
- self._add_db_row(msg)
-
def _request_messages(self, before: bool) -> Sequence[Message]:
if before:
row = self._scrolled_view.get_first_row()
@@ -607,7 +603,7 @@ def _request_history(self, _widget: Any, before: bool) ->
None:
assert self._contact is not None
for row in rows:
if not isinstance(row, events.ApplicationEvent):
- self._add_messages([row])
+ self._add_message_from_storage(row)
elif isinstance(row, events.MUCUserJoined):
self._process_muc_user_joined(row)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a976eb56cf5b6fcdec069ad24b7ef936a527a7a8
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a976eb56cf5b6fcdec069ad24b7ef936a527a7a8
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
