Commits June 2023

commits@gajim.org

1 participants
27 discussions

[Git][gajim/gajim] Pushed new branch message-retraction
by Daniel Brötzmann (＠wurstsalat) 07 Jun '23

07 Jun '23

Daniel Brötzmann pushed new branch message-retraction at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/message-retraction You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Revert: Plugin helpers: Remove unnecessary ignore comment"
by Daniel Brötzmann (＠wurstsalat) 07 Jun '23

07 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 39d250ac by wurstsalat at 2023-06-07T22:19:55+02:00 cfix: Revert: Plugin helpers: Remove unnecessary ignore comment" This reverts commit c2044cea4d9fce61d90ed832e021bfc4339e16d7. - - - - - 1 changed file: - gajim/plugins/helpers.py Changes: ===================================== gajim/plugins/helpers.py ===================================== @@ -31,7 +31,7 @@ class GajimPluginActivateException(Exception): def get_builder(file_name: str, widgets: list[str] | None = None) -> Builder: return Builder(file_name, - widgets, + widgets, # pyright: ignore domain=DOMAIN, gettext_=_) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/39d250ac590beb6aaebc5274038ede1a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/39d250ac590beb6aaebc5274038ede1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 8 commits: cq: PlainWidget: Fix URIType import
by Daniel Brötzmann (＠wurstsalat) 07 Jun '23

07 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 19c006b2 by wurstsalat at 2023-06-07T20:16:13+02:00 cq: PlainWidget: Fix URIType import - - - - - 04648b02 by wurstsalat at 2023-06-07T20:19:08+02:00 cq: Discovery: Remove unnecessary string conversion - - - - - d9f3255f by wurstsalat at 2023-06-07T21:09:01+02:00 cq: Accounts, ChatListStack: Fix imports - - - - - c2044cea by wurstsalat at 2023-06-07T21:09:27+02:00 cq: Plugin helpers: Remove unnecessary ignore comment - - - - - 10388f01 by wurstsalat at 2023-06-07T21:38:07+02:00 cq: Typings: Use union operator for css_parser - - - - - 6fb6eea6 by wurstsalat at 2023-06-07T22:14:41+02:00 cq: AdditionalDataDict: Improve type annotation - - - - - ba7f11ea by wurstsalat at 2023-06-07T22:14:47+02:00 cq: Preview: Improve type annotations - - - - - 18d1505d by wurstsalat at 2023-06-07T22:14:47+02:00 cq: Improve typing stubs for qrcode - - - - - 9 changed files: - gajim/common/helpers.py - gajim/common/preview.py - gajim/gtk/accounts.py - gajim/gtk/chat_list_stack.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/discovery.py - gajim/plugins/helpers.py - typings/css_parser/__init__.pyi - + typings/qrcode/image/pil.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -806,7 +806,8 @@ def set_value(self, full_path: str, key: str, value: str | None) -> None: def get_value(self, full_path: str, key: str, - default: str | None = None) -> Any | None: + default: str | bool | None = None + ) -> Any | None: path_childs = self._get_path_childs(full_path) _dict = self.data ===================================== gajim/common/preview.py ===================================== @@ -159,7 +159,7 @@ def request(self) -> HTTPRequest: return self._request @property - def request_uri(self) -> str | None: + def request_uri(self) -> str: if self._urlparts is None: return '' if self.is_aes_encrypted: @@ -365,11 +365,13 @@ def create_preview(self, self.download_content(preview) elif not preview.thumb_exists: + assert preview.orig_path is not None load_file_async(preview.orig_path, self._on_orig_load_finished, preview) else: + assert preview.thumb_path is not None load_file_async(preview.thumb_path, self._on_thumb_load_finished, preview) @@ -411,6 +413,7 @@ def _on_orig_load_finished(self, preview.file_size = os.path.getsize(preview.orig_path) if preview.is_previewable: if preview.create_thumbnail(data): + assert preview.thumbnail is not None write_file_async(preview.thumb_path, preview.thumbnail, self._on_thumb_write_finished, @@ -571,6 +574,7 @@ def _on_finished(self, request: HTTPRequest) -> None: if preview.is_previewable: if preview.create_thumbnail(data): + assert preview.thumb_path is not None write_file_async(preview.thumb_path, preview.thumbnail, self._on_thumb_write_finished, @@ -580,7 +584,7 @@ def _on_finished(self, request: HTTPRequest) -> None: @staticmethod def _on_orig_write_finished(_result: bool, - error: GLib.Error, + error: GLib.Error | None, preview: Preview) -> None: if preview.orig_path is None: return @@ -598,7 +602,7 @@ def _on_orig_write_finished(_result: bool, @staticmethod def _on_thumb_write_finished(_result: bool, - error: GLib.Error, + error: GLib.Error | None, preview: Preview) -> None: if preview.thumb_path is None: return ===================================== gajim/gtk/accounts.py ===================================== @@ -33,7 +33,7 @@ from gajim.common.const import ClientState from gajim.common.i18n import _ from gajim.common.i18n import p_ -from gajim.common.settings import AllSettingsT +from gajim.common.setting_values import AllSettingsT from gajim.gtk.const import Setting from gajim.gtk.const import SettingKind ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -31,7 +31,7 @@ from gajim.gtk import structs from gajim.gtk.chat_filter import ChatFilter from gajim.gtk.chat_list import ChatList -from gajim.gtk.chat_list import ChatListRow +from gajim.gtk.chat_list_row import ChatListRow from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.dialogs import DialogButton ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -21,9 +21,9 @@ from gi.repository import Gtk from gi.repository import Pango +from gajim.common.const import URIType from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri -from gajim.common.structs import URIType from gajim.common.styling import BaseHyperlink from gajim.common.styling import PlainBlock from gajim.common.styling import process_uris ===================================== gajim/gtk/discovery.py ===================================== @@ -208,7 +208,7 @@ def get_agent_address(jid, node=None): Get an agent's address for displaying in the GUI ''' if node: - return f'{node}@{str(jid)}' + return f'{node}@{jid}' return str(jid) ===================================== gajim/plugins/helpers.py ===================================== @@ -31,7 +31,7 @@ class GajimPluginActivateException(Exception): def get_builder(file_name: str, widgets: list[str] | None = None) -> Builder: return Builder(file_name, - widgets, # pyright: ignore + widgets, domain=DOMAIN, gettext_=_) ===================================== typings/css_parser/__init__.pyi ===================================== @@ -1,7 +1,5 @@ from __future__ import annotations -from typing import Union - from pathlib import Path from . import css as css @@ -13,4 +11,4 @@ from .stylesheets import MediaList ser: CSSSerializer -def parseFile(filename: Union[str, Path], href: str | None = ..., media: Union[MediaList, list[str], str, None] = ..., title: str | None = ..., validate: bool | None = ...) -> None: ... +def parseFile(filename: str | Path, href: str | None = ..., media: MediaList | list[str] | str | None = ..., title: str | None = ..., validate: bool | None = ...) -> None: ... ===================================== typings/qrcode/image/pil.py ===================================== @@ -0,0 +1 @@ +class PilImage: ... \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/caeaf16990119232883db7bfb58150b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/caeaf16990119232883db7bfb58150b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Typings: Use union operator
by Daniel Brötzmann (＠wurstsalat) 07 Jun '23

07 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: caeaf169 by wurstsalat at 2023-06-07T19:23:07+02:00 cq: Typings: Use union operator - - - - - 4 changed files: - typings/css_parser/__init__.pyi - typings/keyring/backend.pyi - typings/keyring/core.pyi - typings/qrcode/__init__.py Changes: ===================================== typings/css_parser/__init__.pyi ===================================== @@ -1,6 +1,5 @@ from __future__ import annotations -from typing import Optional from typing import Union from pathlib import Path @@ -14,4 +13,4 @@ from .stylesheets import MediaList ser: CSSSerializer -def parseFile(filename: Union[str, Path], href: Optional[str] = ..., media: Union[MediaList, list[str], str, None] = ..., title: Optional[str] = ..., validate: Optional[bool] = ...) -> None: ... +def parseFile(filename: Union[str, Path], href: str | None = ..., media: Union[MediaList, list[str], str, None] = ..., title: str | None = ..., validate: bool | None = ...) -> None: ... ===================================== typings/keyring/backend.pyi ===================================== @@ -1,10 +1,9 @@ from typing import Any -from typing import Optional class KeyringBackend: - def get_password(self, service: str, username: str) -> Optional[str]: ... + def get_password(self, service: str, username: str) -> str | None: ... def set_password(self, service: str, username: str, password: str) -> None: ... def delete_password(self, service: str, username: str) -> None: ... def with_properties(self, **kwargs: Any) -> KeyringBackend: ... ===================================== typings/keyring/core.pyi ===================================== @@ -1,9 +1,7 @@ -from typing import Optional - from keyring.backend import KeyringBackend -def get_password(service_name: str, username: str) -> Optional[str]: ... +def get_password(service_name: str, username: str) -> str | None: ... def set_password(service_name: str, username: str, password: str) -> None: ... def delete_password(service_name: str, username: str) -> None: ... def recommended(backend: KeyringBackend) -> bool: ... ===================================== typings/qrcode/__init__.py ===================================== @@ -2,13 +2,12 @@ from __future__ import annotations from typing import Any -from typing import Optional from . import constants as constants class QRCode: - def __init__(self, version: Optional[int], error_correction: int, box_size: int, border: int, image_factory: Optional[Any] = None, mask_pattern: Optional[Any] = None) -> None: ... + def __init__(self, version: int | None, error_correction: int, box_size: int, border: int, image_factory: Any = None, mask_pattern: Any = None) -> None: ... def add_data(self, data: str) -> None: ... def make(self, fit: bool) -> None: ... - def make_image(self, image_factory: Optional[Any] = None, fill_color: str, back_color: str) -> Any: ... + def make_image(self, image_factory: Any = None, **kwargs: Any) -> Any: ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/caeaf16990119232883db7bfb58150ba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/caeaf16990119232883db7bfb58150ba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-replies] feat: Add support for XEP-0461: Message Replies
by Daniel Brötzmann (＠wurstsalat) 07 Jun '23

07 Jun '23

Daniel Brötzmann pushed to branch message-replies at gajim / gajim Commits: 49d17d9a by wurstsalat at 2023-06-07T19:01:39+02:00 feat: Add support for XEP-0461: Message Replies - - - - - 21 changed files: - data/gajim.doap - gajim/common/client.py - gajim/common/events.py - gajim/common/modules/message.py - gajim/common/storage/archive.py - gajim/common/storage/base.py - gajim/common/structs.py - gajim/common/util/text.py - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py - + gajim/gtk/referred_message_widget.py Changes: ===================================== data/gajim.doap ===================================== @@ -693,5 +693,12 @@ <xmpp:version>0.1.0</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0461.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> </Project> </rdf:RDF> ===================================== gajim/common/client.py ===================================== @@ -518,6 +518,7 @@ def _send_message(self, message: OutgoingMessage) -> None: label=message.label, correct_id=message.correct_id, message_id=message.message_id, + reply_data=message.reply_data, msg_log_id=log_line_id, play_sound=message.play_sound)) ===================================== gajim/common/events.py ===================================== @@ -33,6 +33,7 @@ from nbxmpp.structs import HTTPAuthData from nbxmpp.structs import LocationData from nbxmpp.structs import ModerationData +from nbxmpp.structs import ReplyData from nbxmpp.structs import RosterItem from nbxmpp.structs import TuneData @@ -174,6 +175,7 @@ class MessageSent(ApplicationEvent): additional_data: AdditionalDataDict label: SecurityLabel | None correct_id: str | None + reply_data: ReplyData | None play_sound: bool ===================================== gajim/common/modules/message.py ===================================== @@ -231,7 +231,8 @@ def _message_received(self, subject=properties.subject, additional_data=additional_data, stanza_id=stanza_id or message_id, - message_id=properties.id) + message_id=properties.id, + reply_data=properties.reply_data) event.msg_log_id = msg_log_id app.ged.raise_event(event) @@ -275,7 +276,8 @@ def _log_muc_message(self, event: GcMessageReceived) -> int | None: stanza_id=event.stanza_id, message_id=event.properties.id, occupant_id=event.occupant_id, - real_Jid=event.real_jid) + real_Jid=event.real_jid, + reply_data=event.properties.reply_data) return msg_log_id return None @@ -341,6 +343,14 @@ def build_message_stanza(self, message: OutgoingMessage) -> nbxmpp.Message: stanza.setTag('replace', attrs={'id': message.correct_id}, namespace=Namespace.CORRECT) + if message.reply_data is not None: + assert message.reply_data.fallback_start is not None + assert message.reply_data.fallback_end is not None + stanza.setReply(str(message.jid), + message.reply_data.id, + message.reply_data.fallback_start, + message.reply_data.fallback_end) + # XEP-0359 message.message_id = generate_id() stanza.setID(message.message_id) @@ -429,5 +439,6 @@ def log_message(self, message: OutgoingMessage) -> int | None: subject=message.subject, additional_data=message.additional_data, message_id=message.message_id, - stanza_id=message.message_id) + stanza_id=message.message_id, + reply_data=message.reply_data) return msg_log_id ===================================== gajim/common/storage/archive.py ===================================== @@ -38,9 +38,11 @@ from nbxmpp import JID from nbxmpp.structs import CommonError from nbxmpp.structs import MessageProperties +from nbxmpp.structs import ReplyData from gajim.common import app from gajim.common import configpaths +from gajim.common import types from gajim.common.const import JIDConstant from gajim.common.const import KindConstant from gajim.common.const import MAX_MESSAGE_CORRECTION_DELAY @@ -111,6 +113,7 @@ class ConversationRow(NamedTuple): stanza_id: str error: CommonError marker: str + reply_data: ReplyData | None class LastConversationRow(NamedTuple): @@ -121,6 +124,15 @@ class LastConversationRow(NamedTuple): additional_data: AdditionalDataDict | None message_id: str stanza_id: str + reply_data: ReplyData | None + + +class ReferredMessageRow(NamedTuple): + log_line_id: int + contact_name: str + kind: int + time: float + message: str class SearchLogRow(NamedTuple): @@ -268,6 +280,13 @@ def _migrate(self) -> None: ] self._execute_multiple(statements) + if user_version < 8: + statements = [ + 'ALTER TABLE logs ADD COLUMN "reply_data" TEXT', + 'PRAGMA user_version=8' + ] + self._execute_multiple(statements) + @staticmethod def _like(search_str: str) -> str: return f'%{search_str}%' @@ -385,7 +404,8 @@ def get_conversation_before_after(self, SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", - marker as "marker [marker]" + marker as "marker [marker]", + reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -424,7 +444,7 @@ def get_last_conversation_line(self, sql = ''' SELECT contact_name, time, kind, message, stanza_id, message_id, - additional_data + additional_data, reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -462,7 +482,8 @@ def get_conversation_around(self, SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", - marker as "marker [marker]" + marker as "marker [marker]", + reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -476,7 +497,8 @@ def get_conversation_around(self, SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", - marker as "marker [marker]" + marker as "marker [marker]", + reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -521,7 +543,8 @@ def get_conversation_between(self, SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", - marker as "marker [marker]" + marker as "marker [marker]", + reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -960,7 +983,7 @@ def get_last_correctable_message(self, sql = ''' SELECT contact_name, time, kind, message, stanza_id, message_id, - additional_data + additional_data, reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND message_id = ? @@ -1048,6 +1071,30 @@ def try_message_correction(self, return True + @timeit + def get_referred_message(self, + contact: types.ChatContactT, + message_id: str + ) -> ReferredMessageRow | None: + + jids = [contact.jid] + account_id = self.get_account_id(contact.account) + message_id_type = 'message_id' + if contact.is_groupchat: + message_id_type = 'stanza_id' + + sql = ''' + SELECT log_line_id, contact_name, kind, time, message + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND {message_id_type} = ? + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id, + message_id_type=message_id_type) + return self._con.execute( + sql, + tuple(jids) + (message_id, )).fetchone() + @timeit def update_additional_data(self, account: str, ===================================== gajim/common/storage/base.py ===================================== @@ -37,6 +37,7 @@ from nbxmpp.protocol import JID from nbxmpp.structs import CommonError from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import ReplyData from nbxmpp.structs import RosterItem _T = TypeVar('_T') @@ -68,6 +69,22 @@ def _adapt_common_error(common_error: CommonError) -> str: sqlite3.register_adapter(CommonError, _adapt_common_error) +def _convert_reply_data(reply_data: bytes) -> ReplyData: + data = json.loads(reply_data) + return ReplyData(to=data['to'], + id=data['id'], + fallback_start=data['fallback_start'], + fallback_end=data['fallback_end']) + + +def _adapt_reply_data(reply_data: ReplyData) -> str: + return json.dumps(reply_data._asdict()) + + +sqlite3.register_converter('reply_data', _convert_reply_data) +sqlite3.register_adapter(ReplyData, _adapt_reply_data) + + def _convert_marker(marker: bytes): return 'received' if int(marker) == 0 else 'displayed' ===================================== gajim/common/structs.py ===================================== @@ -32,6 +32,7 @@ from nbxmpp.protocol import JID from nbxmpp.structs import MucSubject from nbxmpp.structs import PresenceProperties +from nbxmpp.structs import ReplyData from gajim.common import types from gajim.common.const import KindConstant @@ -99,6 +100,7 @@ def __init__(self, control: Any | None = None, attention: bool | None = None, correct_id: str | None = None, + reply_data: ReplyData | None = None, oob_url: str | None = None, xhtml: str | None = None, nodes: Any | None = None, @@ -137,6 +139,7 @@ def __init__(self, self.control = control self.attention = attention self.correct_id = correct_id + self.reply_data = reply_data self.oob_url = oob_url ===================================== gajim/common/util/text.py ===================================== @@ -51,6 +51,26 @@ def jid_to_iri(jid: str) -> str: return 'xmpp:' + escape_iri_path(jid) +def remove_fallback_text(text: str, + start: int | None, + end: int | None + ) -> str: + + if start is None: + start = 0 + + if end is None: + return text[start:] + + before = text[:start] + after = text[end:] + return before + after + + +def quote_text(text: str) -> str: + return '> ' + text.replace('\n', '\n> ') + '\n' + + def format_duration(ns: float, total_ns: float) -> str: seconds = ns / 1e9 minutes = seconds / 60 ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -5,196 +5,213 @@ <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="hexpand">True</property> - <property name="spacing">2</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> <child> - <placeholder/> - </child> - <child> - <object class="GtkButton" id="encryption_details_button"> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> + <object class="GtkBox" id="action_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no-show-all">True</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_encryption_details_clicked" swapped="no"/> + <property name="hexpand">True</property> + <property name="spacing">2</property> <child> - <object class="GtkImage" id="encryption_details_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon_size">1</property> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="encryption_details_button"> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no-show-all">True</property> + <property name="relief">none</property> + <signal name="clicked" handler="_on_encryption_details_clicked" swapped="no"/> + <child> + <object class="GtkImage" id="encryption_details_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> <child> - <object class="GtkImage" id="encryption_image"> + <object class="GtkMenuButton" id="encryption_menu_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">channel-insecure-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="encryption_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">channel-insecure-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="sendfile_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="action-name">win.send-file</property> - <property name="action-target">['']</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkButton" id="sendfile_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">mail-attachment-symbolic</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="action-name">win.send-file</property> + <property name="action-target">['']</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">mail-attachment-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">3</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Show a list of emojis</property> - <property name="action-name">win.show-emoji-chooser</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkMenuButton" id="emoticons_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">face-smile-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Show a list of emojis</property> + <property name="action-name">win.show-emoji-chooser</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">face-smile-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkButton" id="send_message_button"> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Send Message</property> + <property name="action-name">win.send-message</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">gajim-send-message-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">6</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_message_button"> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Send Message</property> - <property name="action-name">win.send-message</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkMenuButton" id="formattings_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">gajim-send-message-symbolic</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Format your message</property> + <property name="relief">none</property> + <property name="direction">up</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Format your message</property> - <property name="relief">none</property> - <property name="direction">up</property> <child> - <object class="GtkImage"> + <object class="GtkScrolledWindow" id="input_scrolled"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> + <property name="can-focus">True</property> + <property name="margin-start">3</property> + <property name="margin-end">3</property> + <property name="hscrollbar-policy">external</property> + <property name="shadow-type">in</property> + <property name="overlay-scrolling">False</property> + <property name="max-content-height">100</property> + <property name="propagate-natural-height">True</property> + <child> + <placeholder/> + </child> + <style> + <class name="message-input-border"/> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> + <class name="one-line-scrollbar"/> + </style> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="pack-type">end</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="input_scrolled"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="margin-start">3</property> - <property name="margin-end">3</property> - <property name="hscrollbar-policy">external</property> - <property name="shadow-type">in</property> - <property name="overlay-scrolling">False</property> - <property name="max-content-height">100</property> - <property name="propagate-natural-height">True</property> - <child> - <placeholder/> - </child> - <style> - <class name="message-input-border"/> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - <class name="one-line-scrollbar"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> + <placeholder/> </child> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -643,6 +643,12 @@ .code-widget-header button { padding: 0; } +/* ReferredMessageWidget */ +.referred-message { + border-left: 3px solid @borders; + padding: 3px 8px; +} + /* PreviewWidget */ .preview-stack > box { border: 1px solid; ===================================== gajim/gtk/builder.pyi ===================================== @@ -589,6 +589,7 @@ class ManageSoundsBuilder(Builder): class MessageActionsBoxBuilder(Builder): box: Gtk.Box + action_box: Gtk.Box encryption_details_button: Gtk.Button encryption_details_image: Gtk.Image encryption_menu_button: Gtk.MenuButton ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -49,6 +49,7 @@ from gajim.common.storage.draft import DraftStorage from gajim.common.types import ChatContactT from gajim.common.types import OneOnOneContactT +from gajim.common.util.text import remove_fallback_text from gajim.gtk.builder import get_builder from gajim.gtk.menus import get_chat_list_row_menu @@ -157,6 +158,12 @@ def _display_last_conversation_line(self) -> None: if line.message is not None: message_text = line.message + if line.reply_data is not None: + message_text = remove_fallback_text( + line.message, + line.reply_data.fallback_start, + line.reply_data.fallback_end) + if line.additional_data is not None: retracted_by = line.additional_data.get_value( 'retracted', 'by') ===================================== gajim/gtk/chat_stack.py ===================================== @@ -519,6 +519,7 @@ def _update_chat_actions(self, contact: BareContact) -> None: app.window.get_action('quote').set_enabled(online) app.window.get_action('mention').set_enabled(online) + app.window.get_action('reply').set_enabled(online) def _update_group_chat_actions(self, contact: GroupchatContact) -> None: joined = contact.is_joined @@ -543,6 +544,7 @@ def _update_group_chat_actions(self, contact: GroupchatContact) -> None: app.window.get_action('quote').set_enabled(joined) app.window.get_action('mention').set_enabled(joined) + app.window.get_action('reply').set_enabled(joined) app.window.get_action('retract-message').set_enabled(joined) def _update_participant_actions(self, @@ -766,6 +768,11 @@ def _on_send_message(self) -> None: if correct_id is None: return + reply_data = None + message_reply = self._message_action_box.get_reply_data() + if message_reply is not None: + reply_data, message = message_reply + chatstate = client.get_module('Chatstate').get_active_chatstate( contact) @@ -780,11 +787,14 @@ def _on_send_message(self) -> None: chatstate=chatstate, label=label, control=self._chat_control, - correct_id=correct_id) + correct_id=correct_id, + reply_data=reply_data) client.send_message(message_) self._message_action_box.msg_textview.clear() + if message_reply is not None: + self._message_action_box.disable_reply_mode() app.storage.drafts.set(contact, '') def get_last_message_id(self, contact: ChatContactT) -> str | None: ===================================== gajim/gtk/const.py ===================================== @@ -223,6 +223,8 @@ def __str__(self): ('copy-message', 's', True), ('retract-message', 'a{sv}', False), ('quote', 's', False), + ('reply', 'as', False), + ('jump-to-message', 'au', True), ('mention', 's', False), ('send-file-httpupload', 'as', False), ('send-file-jingle', 'as', False), ===================================== gajim/gtk/control.py ===================================== @@ -27,6 +27,7 @@ from nbxmpp.const import StatusCode from nbxmpp.modules.security_labels import Displaymarking from nbxmpp.structs import MucSubject +from nbxmpp.structs import ReplyData from gajim.common import app from gajim.common import events @@ -44,6 +45,7 @@ from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow +from gajim.common.util.text import remove_fallback_text from gajim.gtk.builder import get_builder from gajim.gtk.conversation.jump_to_end_button import JumpToEndButton @@ -95,6 +97,8 @@ def __init__(self) -> None: app.window.get_action('activate-message-selection').connect( 'activate', self._on_activate_message_selection) + app.window.get_action('jump-to-message').connect( + 'activate', self._on_jump_to_message) self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -288,7 +292,8 @@ def _on_message_sent(self, event: events.MessageSent) -> None: displaymarking=displaymarking, message_id=message_id, msg_log_id=event.msg_log_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.reply_data) def _on_message_received(self, event: events.MessageReceived) -> None: if not self._is_event_processable(event): @@ -311,7 +316,8 @@ def _on_message_received(self, event: events.MessageReceived) -> None: msg_log_id=event.msg_log_id, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.properties.reply_data) def _on_mam_message_received(self, event: events.MamMessageReceived) -> None: @@ -330,7 +336,8 @@ def _on_mam_message_received(self, contact=event.properties.muc_nickname, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.properties.reply_data) else: @@ -350,7 +357,8 @@ def _on_mam_message_received(self, tim=event.properties.mam.timestamp, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.properties.reply_data) def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: if not self._is_event_processable(event): @@ -370,7 +378,8 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: message_id=event.properties.id, stanza_id=event.stanza_id, msg_log_id=event.msg_log_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.properties.reply_data) def _on_message_updated(self, event: events.MessageUpdated) -> None: if not self._is_event_processable(event): @@ -497,6 +506,14 @@ def _on_copy_selection(self, _widget: MessageSelection) -> None: def _on_cancel_selection(self, _widget: MessageSelection) -> None: self._scrolled_view.disable_row_selection() + def _on_jump_to_message(self, + _action: Gio.SimpleAction, + param: GLib.Variant + ) -> None: + + log_line_id, timestamp = param.unpack() + self.scroll_to_message(log_line_id, timestamp) + def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() @@ -549,12 +566,23 @@ def _add_message(self, msg_log_id: int | None = None, message_id: str | None = None, stanza_id: str | None = None, - additional_data: AdditionalDataDict | None = None + additional_data: AdditionalDataDict | None = None, + reply_data: ReplyData | None = None ) -> None: if additional_data is None: additional_data = AdditionalDataDict() + referred_message = None + if reply_data is not None: + referred_message = app.storage.archive.get_referred_message( + self._contact, reply_data.id) + if referred_message is not None: + text = remove_fallback_text( + text, + reply_data.fallback_start, + reply_data.fallback_end) + if self._allow_add_message(): self._scrolled_view.add_message( text, @@ -565,7 +593,8 @@ def _add_message(self, message_id=message_id, stanza_id=stanza_id, log_line_id=msg_log_id, - additional_data=additional_data) + additional_data=additional_data, + referred_message=referred_message) if not self._scrolled_view.get_autoscroll(): if kind == 'outgoing': @@ -758,6 +787,16 @@ def add_messages(self, messages: list[ConversationRow]): message_text = get_retraction_text( self.contact.account, retracted_by, reason) + referred_message = None + if msg.reply_data is not None: + referred_message = app.storage.archive.get_referred_message( + self._contact, msg.reply_data.id) + if referred_message is not None: + message_text = remove_fallback_text( + message_text, + msg.reply_data.fallback_start, + msg.reply_data.fallback_end) + self._scrolled_view.add_message( message_text, kind, @@ -768,7 +807,8 @@ def add_messages(self, messages: list[ConversationRow]): stanza_id=msg.stanza_id, log_line_id=msg.log_line_id, marker=msg.marker, - error=msg.error) + error=msg.error, + referred_message=referred_message) def add_message(self, text: str, @@ -778,7 +818,8 @@ def add_message(self, msg_log_id: int | None = None, stanza_id: str | None = None, message_id: str | None = None, - additional_data: AdditionalDataDict | None = None + additional_data: AdditionalDataDict | None = None, + reply_data: ReplyData | None = None ) -> None: if kind == 'incoming': @@ -794,7 +835,8 @@ def add_message(self, msg_log_id=msg_log_id, message_id=message_id, stanza_id=stanza_id, - additional_data=additional_data) + additional_data=additional_data, + reply_data=reply_data) def _on_user_nickname_changed(self, _contact: types.GroupchatContact, @@ -1206,6 +1248,7 @@ def add_muc_message(self, stanza_id: str | None = None, msg_log_id: int | None = None, additional_data: AdditionalDataDict | None = None, + reply_data: ReplyData | None = None ) -> None: assert isinstance(self._contact, GroupchatContact) @@ -1224,7 +1267,8 @@ def add_muc_message(self, message_id=message_id, stanza_id=stanza_id, msg_log_id=msg_log_id, - additional_data=additional_data) + additional_data=additional_data, + reply_data=reply_data) def _on_room_subject(self, contact: GroupchatContact, ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -39,6 +39,7 @@ from gajim.common.i18n import is_rtl_text from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.storage.archive import ReferredMessageRow from gajim.common.types import ChatContactT from gajim.gtk.conversation.message_widget import MessageWidget @@ -50,6 +51,7 @@ from gajim.gtk.conversation.rows.widgets import NicknameLabel from gajim.gtk.menus import get_chat_row_menu from gajim.gtk.preview import PreviewWidget +from gajim.gtk.referred_message_widget import ReferredMessageWidget from gajim.gtk.util import format_fingerprint from gajim.gtk.util import GajimPopover @@ -70,7 +72,9 @@ def __init__(self, display_marking: Displaymarking | None = None, marker: str | None = None, error: CommonError | StanzaError | None = None, - log_line_id: int | None = None) -> None: + log_line_id: int | None = None, + referred_message: ReferredMessageRow | None = None + ) -> None: BaseRow.__init__(self, account) self.type = 'chat' @@ -100,6 +104,8 @@ def __init__(self, # Keep original text for message correction self._original_text: str = text + self._ref_message_widget = None + if self._is_groupchat: our_nick = get_group_chat_nick(self._account, self._contact.jid) from_us = name == our_nick @@ -115,6 +121,11 @@ def __init__(self, app.preview_manager.create_preview( text, self._message_widget, from_us, muc_context) else: + if referred_message is not None: + self._ref_message_widget = ReferredMessageWidget( + self._contact, + referred_message) + self._message_widget = MessageWidget(account) self._message_widget.add_with_styling(text, nickname=name) if self._is_groupchat: @@ -173,7 +184,13 @@ def __init__(self, self._avatar_box = AvatarBox(self._contact, name, avatar) self._bottom_box = Gtk.Box(spacing=6) - self._bottom_box.add(self._message_widget) + if self._ref_message_widget is not None: + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=3) + box.add(self._ref_message_widget) + box.add(self._message_widget) + self._bottom_box.add(box) + else: + self._bottom_box.add(self._message_widget) if is_rtl_text(text): self._bottom_box.set_halign(Gtk.Align.END) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -44,6 +44,7 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow +from gajim.common.storage.archive import ReferredMessageRow from gajim.common.types import ChatContactT from gajim.gtk.conversation.rows.base import BaseRow @@ -506,7 +507,8 @@ def add_message(self, display_marking: Displaymarking | None = None, additional_data: AdditionalDataDict | None = None, marker: str | None = None, - error: CommonError | StanzaError | None = None + error: CommonError | StanzaError | None = None, + referred_message: ReferredMessageRow | None = None ) -> None: if not timestamp: @@ -525,7 +527,8 @@ def add_message(self, display_marking=display_marking, marker=marker, error=error, - log_line_id=log_line_id) + log_line_id=log_line_id, + referred_message=referred_message) if message_id is not None: self._message_id_row_map[message_id] = message_row ===================================== gajim/gtk/menus.py ===================================== @@ -705,9 +705,24 @@ def get_chat_row_menu(contact: types.ChatContactT, show_quote = not self_contact.role.is_visitor else: show_quote = False + if show_quote: - menu_items.append(( - p_('Message row action', 'Quote…'), 'win.quote', text)) + if isinstance(contact, GroupchatContact) and stanza_id is None: + # Use XEP-0393 quotes for MUCs without XEP-0359 IDs + menu_items.append(( + p_('Message row action', 'Quote…'), 'win.quote', text)) + else: + if isinstance(contact, GroupchatContact): + reply_to_id = stanza_id + resource_contact = contact.get_resource(name) + jid = str(resource_contact.real_jid or resource_contact.jid) + else: + reply_to_id = message_id + jid = contact.jid.bare + menu_items.append(( + p_('Message row action', 'Reply…'), + 'win.reply', + GLib.Variant('as', [reply_to_id, jid]))) show_correction = False if message_id is not None: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -28,6 +28,7 @@ from gi.repository import Gtk from nbxmpp.const import Chatstate from nbxmpp.modules.security_labels import SecurityLabel +from nbxmpp.structs import ReplyData from gajim.common import app from gajim.common.client import Client @@ -39,12 +40,14 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT +from gajim.common.util.text import quote_text from gajim.gtk.builder import get_builder from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.menus import get_encryption_menu from gajim.gtk.menus import get_format_menu from gajim.gtk.message_input import MessageInputTextView +from gajim.gtk.referred_message_widget import ReferredMessageWidget from gajim.gtk.security_label_selector import SecurityLabelSelector from gajim.gtk.util import open_window @@ -66,6 +69,11 @@ def __init__(self) -> None: # For undo self.space_pressed = False + # For message replies + self._reply_box = None + self._reply_data = None + self._reply_quoted_text = None + self._ui.send_message_button.set_visible( app.settings.get('show_send_message_button')) app.settings.bind_signal('show_send_message_button', @@ -73,7 +81,8 @@ def __init__(self) -> None: 'set_visible') self._security_label_selector = SecurityLabelSelector() - self._ui.box.pack_start(self._security_label_selector, False, True, 0) + self._ui.action_box.pack_start( + self._security_label_selector, False, True, 0) self.msg_textview = MessageInputTextView() self.msg_textview.get_buffer().connect('changed', @@ -96,7 +105,7 @@ def __init__(self) -> None: self._connect_actions() app.plugin_manager.gui_extension_point( - 'message_actions_box', self, self._ui.box) + 'message_actions_box', self, self._ui.action_box) def get_current_contact(self) -> ChatContactT: assert self._contact is not None @@ -114,6 +123,7 @@ def _connect_actions(self) -> None: 'show-emoji-chooser', 'quote', 'mention', + 'reply', 'correct-message', ] @@ -154,6 +164,11 @@ def _on_action(self, assert param self.msg_textview.insert_as_quote(param.get_string()) + elif action_name == 'reply': + assert param + reply_to_id, jid = param.get_strv() + self._enable_reply_mode(reply_to_id, jid) + elif action_name == 'mention': assert param self.msg_textview.mention_participant(param.get_string()) @@ -173,6 +188,8 @@ def switch_contact(self, contact: ChatContactT) -> None: self._client.connect_signal( 'state-changed', self._on_client_state_changed) + self.disable_reply_mode() + self._contact = contact if isinstance(self._contact, GroupchatContact): @@ -536,6 +553,55 @@ def _on_msg_textview_key_press_event(self, return False + def _enable_reply_mode(self, reply_to_id: str, jid: str) -> None: + if self._reply_data is not None: + # If reply was called again, remove the last reply box first + self.disable_reply_mode() + + assert self._contact is not None + referred_message_row = app.storage.archive.get_referred_message( + self._contact, reply_to_id) + assert referred_message_row is not None + + self._reply_quoted_text = quote_text(referred_message_row.message) + self._reply_data = ReplyData( + to=jid, + id=reply_to_id, + fallback_start=0, + fallback_end=len(self._reply_quoted_text)) + + close_button = Gtk.Button.new_from_icon_name( + 'window-close-symbolic', Gtk.IconSize.BUTTON) + close_button.set_valign(Gtk.Align.CENTER) + close_button.set_tooltip_text(_('Cancel')) + close_button.connect('clicked', self.disable_reply_mode) + + ref_widget = ReferredMessageWidget(self._contact, referred_message_row) + + self._reply_box = Gtk.Box(spacing=14) + self._reply_box.add(close_button) + self._reply_box.add(ref_widget) + + self._ui.box.pack_start(self._reply_box, True, True, 0) + self._reply_box.show_all() + + self.msg_textview.grab_focus() + + def disable_reply_mode(self, *args: Any) -> None: + self._reply_data = None + self._reply_quoted_text = None + if self._reply_box is not None: + self._reply_box.destroy() + self._reply_box = None + + def get_reply_data(self) -> tuple[ReplyData, str] | None: + if self._reply_data is None or self._reply_quoted_text is None: + return None + + message = self.msg_textview.get_text() + fallback_text = f'{self._reply_quoted_text}{message}' + return self._reply_data, fallback_text + def _on_paste_clipboard(self, texview: MessageInputTextView ) -> None: ===================================== gajim/gtk/message_input.py ===================================== @@ -38,6 +38,7 @@ from gajim.common.styling import PlainBlock from gajim.common.styling import process from gajim.common.types import ChatContactT +from gajim.common.util.text import remove_fallback_text from gajim.gtk.chat_action_processor import ChatActionProcessor from gajim.gtk.const import MAX_MESSAGE_LENGTH @@ -140,9 +141,16 @@ def toggle_message_correction(self) -> None: if message_row is None or message_row.message is None: return + text = message_row.message + if message_row.reply_data is not None: + text = remove_fallback_text( + message_row.message, + message_row.reply_data.fallback_start, + message_row.reply_data.fallback_end) + self._set_correcting(True) self.get_style_context().add_class('gajim-msg-correcting') - self.insert_text(message_row.message) + self.insert_text(text) def try_message_correction(self, message: str) -> str | None: assert self._contact is not None ===================================== gajim/gtk/referred_message_widget.py ===================================== @@ -0,0 +1,93 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from datetime import datetime + +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common import types +from gajim.common.const import KindConstant +from gajim.common.helpers import from_one_line +from gajim.common.i18n import _ +from gajim.common.storage.archive import ReferredMessageRow + + +class ReferredMessageWidget(Gtk.Box): + def __init__(self, + contact: types.ChatContactT, + referred_message: ReferredMessageRow + ) -> None: + + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_halign(Gtk.Align.START) + self.get_style_context().add_class('referred-message') + + self._referred_message = referred_message + + if contact.is_groupchat: + ref_str = _('%s wrote') % referred_message.contact_name + else: + if referred_message.kind == KindConstant.CHAT_MSG_RECV: + ref_str = _('%s wrote') % contact.name + else: + ref_str = _('You wrote') + + icon = Gtk.Image.new_from_icon_name( + 'mail-reply-sender-symbolic', + Gtk.IconSize.BUTTON) + icon.get_style_context().add_class('dim-label') + + name_label = Gtk.Label(label=ref_str) + name_label.get_style_context().add_class('dim-label') + + date_time = datetime.fromtimestamp(referred_message.time) + time_format = from_one_line(app.settings.get('date_time_format')) + timestamp_label = Gtk.Label( + label=f'({date_time.strftime(time_format)})') + timestamp_label.get_style_context().add_class('dim-label') + + jump_to_button = Gtk.LinkButton(label=_('[view message]')) + jump_to_button.connect('activate-link', self._on_jump_clicked) + + meta_box = Gtk.Box(spacing=6) + meta_box.get_style_context().add_class('small-label') + meta_box.add(icon) + meta_box.add(name_label) + meta_box.add(timestamp_label) + meta_box.add(jump_to_button) + + message_text = referred_message.message.split('\n')[0] + message_label = Gtk.Label(label=message_text) + message_label.set_halign(Gtk.Align.START) + message_label.set_max_width_chars(52) + message_label.set_ellipsize(Pango.EllipsizeMode.END) + message_label.get_style_context().add_class('dim-label') + + self.add(meta_box) + self.add(message_label) + + self.show_all() + + def _on_jump_clicked(self, _button: Gtk.LinkButton) -> bool: + app.window.activate_action( + 'jump-to-message', GLib.Variant( + 'au', + [self._referred_message.log_line_id, + self._referred_message.time])) + return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49d17d9aff28910b01e56372090363a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49d17d9aff28910b01e56372090363a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-replies] 282 commits: change: Raise nbxmpp version to 4.2.0
by Daniel Brötzmann (＠wurstsalat) 07 Jun '23

07 Jun '23

Daniel Brötzmann pushed to branch message-replies at gajim / gajim Commits: 6aa2a6d4 by Philipp Hörist at 2023-02-05T17:44:54+01:00 change: Raise nbxmpp version to 4.2.0 - - - - - 97679843 by Philipp Hörist at 2023-02-05T17:44:54+01:00 fix: Apply SASLprep to passwords This fixes the case where it was not possible to login with Gajim when some special characters where used in the password - - - - - e837ef4e by Philipp Hörist at 2023-02-05T20:34:25+01:00 feat: Improve KeepassXC Integration Provide setting which improves the KeepassXC Integration NOTES: If you already used KeepassXC with Gajim, enabling the new integration setting will trigger new entries in the password manager - - - - - 42df93c3 by Philipp Hörist at 2023-02-05T21:42:26+01:00 refactor: Add MemoryPasswordStorage This helps to provide a uniform interface for setting and getting passwords - - - - - b8bbae6e by Philipp Hörist at 2023-02-06T21:38:06+01:00 imprv: MUC: Enable archiving when creating MUCs on ejabberd - - - - - 0e9d53f4 by Weblate at 2023-02-08T21:57:53+01:00 chore: Update translations - - - - - 1afc701c by Philipp Hörist at 2023-02-08T22:08:41+01:00 other: Flatpak: Update dependencies - - - - - a600ca70 by Philipp Hörist at 2023-02-08T22:09:28+01:00 release: 1.7.1 - - - - - 23ba79a3 by wurstsalat at 2023-02-10T20:46:08+01:00 fix: Start Chat: Fix wrong JID type in _start_new_chat Fixes #11398 - - - - - e2569508 by wurstsalat at 2023-02-10T20:50:25+01:00 fix: Plugins: Don't fail hard on uninstall errors Fixes #11389 - - - - - 45f2388f by wurstsalat at 2023-02-10T21:08:18+01:00 fix: Nickname completion: Make sure recent nicknames list does not contain None Fixes #11394 - - - - - f5635b84 by wurstsalat at 2023-02-10T21:53:50+01:00 imprv: Audio preview: Allow skipping by clicking the visualization Closes #11392 - - - - - 799b8c21 by wurstsalat at 2023-02-11T18:58:59+01:00 fix: Don't highlight message if it's an URI containing our nick Fixes #11387 - - - - - 63a0e85b by Philipp Hörist at 2023-02-13T19:59:30+01:00 imprv: Add audio/x-wav to default mime types - - - - - 94e227f0 by wurstsalat at 2023-02-14T21:45:26+01:00 fix: GetRelativeTimeTest: Fix comparison of translated strings and off-by timezone errors - - - - - 0618ab18 by wurstsalat at 2023-02-14T21:45:26+01:00 cfix: Settings values: Make additional_uri_schemes a string setting - - - - - 1526a6db by wurstsalat at 2023-02-14T21:45:26+01:00 imprv: Tests: Use in-memory settings database - - - - - c1225720 by wurstsalat at 2023-02-14T21:45:26+01:00 imprv: Improve check for message highlight and add tests - - - - - e57e7b5c by wurstsalat at 2023-02-14T21:59:07+01:00 imprv: Improve get_recent_muc_nicks query - - - - - ff12e81a by wurstsalat at 2023-02-15T20:23:17+01:00 fix: Profile: Don't allow saving profile when not connected Fixes #11401 - - - - - b5a3c285 by wurstsalat at 2023-02-15T20:48:13+01:00 cq: Use correct data type for ngettext - - - - - 9d7c788a by wurstsalat at 2023-02-15T21:01:19+01:00 cq: Text styling: Add type hint - - - - - 951a7a1e by wurstsalat at 2023-02-15T21:02:18+01:00 ci: Update pyright config - - - - - 677244fd by wurstsalat at 2023-02-17T14:20:48+01:00 imprv: PEPConfig: Ask for confirmation when deleting nodes - - - - - 64719feb by Daniel Brötzmann at 2023-02-17T13:27:19+00:00 cfix: HighlightTest: Fix xmpp address test - - - - - 9ae5487e by Philipp Hörist at 2023-02-19T10:47:19+01:00 imprv: Don’t color log timestamps - - - - - 2959a47d by Philipp Hörist at 2023-02-19T10:47:19+01:00 refactor: Simplify action lookup - - - - - 1b993e59 by Philipp Hörist at 2023-02-19T10:47:20+01:00 refactor: Remove unnecessary None check - - - - - ca959adb by Philipp Hörist at 2023-02-19T10:47:20+01:00 cq: Narrow expected type - - - - - a29845d7 by wurstsalat at 2023-02-19T16:43:00+01:00 imprv: Select group chat after creating it Fixes #11304 - - - - - 508b0523 by wurstsalat at 2023-02-19T22:34:17+01:00 cfix: Improve get_recent_muc_nicks query - - - - - 1e165ac4 by wurstsalat at 2023-02-20T10:48:13+01:00 other: Windows installer: Remove 'Run application' checkbox on finish page Running Gajim after the setup (which is using elevated privileges) will run gajim.exe in the same context. This may lead to problems, since Gajim should not be run with elevated privileges. Running with user privileges can not be easily achieved using NSIS. Therefore, running the application after the setup has been disabled. - - - - - 7aef2aa6 by wurstsalat at 2023-02-20T18:27:38+01:00 imprv: Windows: Offer direct download of Gajim setup when update is available - - - - - a39f0a1b by wurstsalat at 2023-02-20T20:09:19+01:00 imprv: Windows: Add direct download for Gajim Portable updates - - - - - aa5cb0a9 by wurstsalat at 2023-02-20T19:55:08+00:00 imprv: Proxies: Add 'Tor (Browser)' default proxy setting - - - - - 08f9b39a by wurstsalat at 2023-02-21T20:28:27+01:00 imprv: Add message menu entry for deleting messages locally - - - - - 8c1cfd90 by wurstsalat at 2023-02-24T10:12:12+01:00 fix: Fix nickname highlight in group chats Fixes #11413 - - - - - 0b0f9ba9 by wurstsalat at 2023-03-02T09:25:03+01:00 fix: Notifications: Honor notification_preview_message setting - - - - - 535f7b44 by Daniel Brötzmann at 2023-03-02T09:21:55+00:00 imprv: Windows installer: Add Polish language - - - - - 79923364 by wurstsalat at 2023-03-03T09:30:13+01:00 cfix: Windows installer: Save files using UTF-8 with BOM, convert intendation to spaces - - - - - bda77f26 by Michel Le Bihan at 2023-03-05T16:57:08+00:00 imprv: Declare that the installer is DPI-aware - - - - - bc14c535 by wurstsalat at 2023-03-09T18:59:28+00:00 fix: Don't fail if contact name for MUC message is None Fixes #11417 - - - - - 526782cc by wurstsalat at 2023-03-09T19:07:36+00:00 fix: Show chat notifications when chat page is not visible Fixes #11416 - - - - - 73e3ee88 by mesonium at 2023-03-09T15:03:07-05:00 cfix: Update links to GNOME Gtk and GLib repo - - - - - 67443ab9 by Nicoco at 2023-03-11T18:33:40+00:00 fix: Chatstates: Remove composing timeout correctly - - - - - f9058e21 by Philipp Hörist at 2023-03-11T19:48:30+01:00 fix: HTTPUpload: Respect infinite file size limit Fixes #11436 - - - - - 44cbd2ff by Philipp Hörist at 2023-03-11T19:55:05+01:00 fix: Migration: Don’t fail on color setting migration Fixes #11426 - - - - - 7d8e24a6 by Weblate at 2023-03-11T20:25:41+01:00 chore: Update translations - - - - - 2b0a1423 by Philipp Hörist at 2023-03-11T20:29:35+01:00 release: 1.7.2 - - - - - ab6c80fe by Philipp Hörist at 2023-03-12T12:48:03+01:00 other: Update release issue template - - - - - d3fee1d9 by Philipp Hörist at 2023-03-14T23:18:33+01:00 cq: Improve various type annotations - - - - - 5fdc3866 by Philipp Hörist at 2023-03-26T15:47:34+02:00 chore: Add libappindicator as optional dependency - - - - - 29219f72 by wurstsalat at 2023-03-26T19:24:56+02:00 fix: Account preferences: Adapt to changed icons - - - - - da84ac3f by wurstsalat at 2023-03-26T20:52:57+02:00 fix: ChatActionProcessor: Fix inserting emojis by click Fixes #11445 - - - - - 804ec595 by Philipp Hörist at 2023-03-27T20:50:49+02:00 cq: Remove trailing whitespace - - - - - d10a154f by Philipp Hörist at 2023-03-27T20:56:34+02:00 ci: Update ruff to 0.0.259 - - - - - 93455cfb by wurstsalat at 2023-03-29T20:41:18+02:00 imprv: Workspace menu: Always show Mark as read action - - - - - 325f10fa by wurstsalat at 2023-03-29T20:53:23+02:00 refactor: Use Gdk button constants for click events - - - - - b8fc0a13 by wurstsalat at 2023-03-29T21:28:11+02:00 refactor: Use datetime directly for get_uf_relative_time - - - - - 2a1bad9b by wurstsalat at 2023-03-29T23:03:58+02:00 fix: Update message merged state after deleting a message Fixes #11438 - - - - - f4f1aa7d by wurstsalat at 2023-03-30T15:02:28+02:00 fix: Message input: Fix height for single line messages - - - - - bf7ed98b by wurstsalat at 2023-03-30T20:44:32+02:00 fix: GroupChatDetails: Adapt to changed icons - - - - - 537d7177 by André Apitzsch at 2023-04-02T12:09:13+02:00 chore: Flatpak: Update runtime + dependencies - - - - - b379bf77 by André Apitzsch at 2023-04-02T17:27:58+02:00 fix: Flatpak: Fix drag and drop Fixes #10370. - - - - - b908b71b by Daniel Brötzmann at 2023-04-02T15:53:13+00:00 feat: Allow muting chat notifications - - - - - 91d16189 by mesonium at 2023-04-03T17:54:02+00:00 other: Flatpak: Update README.md Add --user to flatpak-builder command - - - - - 3eed6817 by mjk at 2023-04-03T17:54:59+00:00 imprv: Make `gemini` URIs clickable - - - - - 39d68bb5 by mesonium at 2023-04-04T19:27:51+02:00 fix: Audio Preview: Add delay before pausing on EOS When playbin sends an EOS signal the audio may not have been fully run through the whole pipeline. That means pausing immediately on EOS may clip the last fraction. To workaround, add a delay before pausing the playback due to the EOS signal. Fixes #11423 - - - - - 46c42453 by Philipp Hörist at 2023-04-04T20:31:50+02:00 change: Raise nbxmpp version - - - - - 535b8bb2 by mesonium at 2023-04-04T21:04:57+02:00 fix: Audio Preview: Set correct pos when clicking into visualizer - - - - - 20376212 by Philipp Hörist at 2023-04-04T22:07:26+02:00 chore: Flatpak: Update dependencies - - - - - 7a4f1d16 by Weblate at 2023-04-04T22:07:26+02:00 chore: Update translations - - - - - c533eb87 by Philipp Hörist at 2023-04-04T22:09:46+02:00 release: 1.7.3 - - - - - c28bf8bf by Philipp Hörist at 2023-04-05T20:36:49+02:00 ci: Debian: Raise nbxmpp-nightly version - - - - - f5f12102 by Daniel Brötzmann at 2023-04-08T07:57:18+00:00 feat: Redesign Group Chat actions - Move chat menu into banner - Give some actions their own buttons - Make Group Chat Roster resizable - Add participant search to Group Chat Roster Fixes #10362 - - - - - 11aedfb6 by André Apitzsch at 2023-04-08T12:11:26+02:00 other: Cover more modules with update_flatpak_manifest Also compare the python version when updating modules, to support updating packages that provide several *.whl files, like protobuf. - - - - - 9ab3d5d3 by Michel Le Bihan at 2023-04-09T10:08:17+00:00 other: Windows: Use MINGW_PACKAGE_PREFIX for dev env - - - - - 5ec32555 by Philipp Hörist at 2023-04-09T13:04:15+02:00 ci: Windows: Update dependencies - - - - - 7980ed6c by Philipp Hörist at 2023-04-09T13:12:41+02:00 ci: Windows: Remove support for mingw32 in build script - - - - - 24548c14 by Philipp Hörist at 2023-04-09T19:44:52+02:00 ci: Windows: Update dev env script - - - - - 7a585f20 by Daniel Brötzmann at 2023-04-09T18:13:39+00:00 feat: Integrate OMEMO plugin - - - - - 1b54d92e by Philipp Hörist at 2023-04-10T15:59:05+02:00 ci: Windows: Fix installing omemo-dr - - - - - a5a40c64 by Philipp Hörist at 2023-04-10T18:58:34+02:00 ci: Debian: Install python3-omemo-dr - - - - - c681b426 by Philipp Hörist at 2023-04-10T19:02:05+02:00 ci: Allow debian build workflow - - - - - 253fb678 by Philipp Hörist at 2023-04-10T19:43:42+02:00 cfix: Banner: Expand description label - - - - - 229fc4bc by Philipp Hörist at 2023-04-10T23:31:59+02:00 refactor: HTTP: Allow passing proxy when creating session - - - - - 475d6295 by Philipp Hörist at 2023-04-10T23:33:19+02:00 fix: AccountWizard: Respect global proxy Fixes #11452 - - - - - e3140f23 by Philipp Hörist at 2023-04-11T00:04:02+02:00 cq: Fix type annotation - - - - - 53c28dd8 by Philipp Hörist at 2023-04-11T00:06:38+02:00 ci: Raise pyright version - - - - - feaa6228 by Philipp Hörist at 2023-04-11T17:42:28+02:00 ci: Windows: Fix installing omemo-dr - - - - - c24ad2d8 by André at 2023-04-11T19:59:02+00:00 fix: CertificateDialog: Display issued-to information correctly - - - - - bcd7e6a0 by Philipp Hörist at 2023-04-11T23:32:12+02:00 ci: Run deploy jobs out of order - - - - - 73f5d470 by Michel Le Bihan at 2023-04-13T19:06:23+00:00 ci: Windows: Make build work in any MSYS environment - - - - - 2a0cbe90 by Philipp Hörist at 2023-04-14T15:52:06+02:00 ci: Allow manual Windows build in MR pipelines - - - - - 9c566bd1 by Philipp Hörist at 2023-04-14T23:03:18+02:00 ci: Windows: Cleanup appveyor.yml - - - - - 12fd384c by Philipp Hörist at 2023-04-14T23:23:02+02:00 ci: Adapt to release-helper changes - - - - - bf439abe by Philipp Hörist at 2023-04-14T23:43:26+02:00 ci: Add variable to trigger windows nightly builds - - - - - 1b981217 by Michel Le Bihan at 2023-04-14T21:44:51+00:00 ci: Windows: Fix building installer - - - - - 810b48a8 by Philipp Hörist at 2023-04-15T09:47:15+02:00 ci: Use python3-build from image - - - - - e3c64a20 by Philipp Hörist at 2023-04-15T20:52:16+02:00 refactor: Return mime types as Set - - - - - 40928818 by Philipp Hörist at 2023-04-15T20:55:49+02:00 new: Preview: Add more logging - - - - - 60be989f by Philipp Hörist at 2023-04-15T21:23:25+02:00 cq: Remove unnecessary list() call - - - - - 5e2011fe by Philipp Hörist at 2023-04-16T13:05:47+02:00 fix: Preview: Display webp and avif images on Windows correctly - Gio.content_type_guess() returns a file extension, use Gio.content_type_get_mime_type() to get the mime type - - - - - fd1aa01c by mjk at 2023-04-16T12:41:04+00:00 imprv: Windows: Package pixbuf loaders for avif and webp - - - - - d11283a8 by André Apitzsch at 2023-04-16T12:42:49+00:00 chore: Scripts: Add URL pointing to additional release information to AppData - - - - - e7da059c by André Apitzsch at 2023-04-16T12:42:49+00:00 other: AppData: Add URLs to this year's releases - - - - - 293127fa by wurstsalat at 2023-04-16T15:10:03+02:00 cfix: OMEMO: Remove obsolete qr code message - - - - - b7235b5a by wurstsalat at 2023-04-16T15:10:03+02:00 cq: Satisfly linter for generated ui types - - - - - 047f5138 by wurstsalat at 2023-04-16T15:10:03+02:00 refactor: Move QR code generation to helpers - - - - - 45219590 by wurstsalat at 2023-04-16T15:10:03+02:00 imprv: ChatBanner: Add QR code for sharing JIDs Fixes #11429 - - - - - 6e3dec33 by wurstsalat at 2023-04-16T16:33:59+02:00 cfix: ChatBanner: Use jid_to_iri for QR code - - - - - 77f2b223 by wurstsalat at 2023-04-16T16:45:34+02:00 fix: GroupChatInviter: Don't filter by account name Fixes #11474 - - - - - ed3a18b7 by wurstsalat at 2023-04-16T17:19:34+02:00 fix: GroupChatRoster: Make scrollbar the right-most widget Fixes #11290 - - - - - dd257eb9 by wurstsalat at 2023-04-16T17:34:13+02:00 imprv: GroupchatDetails: Hide OMEMO page in public MUCs - - - - - cbea0766 by wurstsalat at 2023-04-16T17:42:34+02:00 fix: MessageActionsBox: Update send file button tooltip when switching chats Fixes #11473 - - - - - bd71d7db by Philipp Hörist at 2023-04-16T18:48:30+02:00 ci: Add gajim-test image - Add codespell stage - Don’t install linters on each run - - - - - 79ef0d0c by wurstsalat at 2023-04-16T19:22:29+02:00 imprv: CertificateDialog: Add additional infos and remove org unit field - Remove org unit field - Add Subject Alt Names - Add Public key information Fixes #11461 - - - - - 8e54bc9a by Philipp Hörist at 2023-04-16T19:25:30+02:00 ci: Don't use python3/pip3 - - - - - f4223ebe by Philipp Hörist at 2023-04-16T19:45:33+02:00 ci: Don’t invoke with python -m - - - - - ddba9947 by Philipp Hörist at 2023-04-16T19:50:21+02:00 ci: Fix coverage invocation - - - - - 7be645e9 by Philipp Hörist at 2023-04-16T20:30:52+02:00 ci: Use old coverage invocation again - - - - - 5f77a254 by Philipp Hörist at 2023-04-17T20:58:16+02:00 refactor: Don’t pass nbxmpp errors and properties to GUI layer Process as much as possible in the common module - - - - - 99dad790 by Michel Le Bihan at 2023-04-21T15:03:41+00:00 feat: Detect dark theme on Windows - - - - - b10e13cc by Philipp Hörist at 2023-04-21T20:35:56+02:00 fix: Make manually changing the pinned chat sort order work again - - - - - afc5a11e by wurstsalat at 2023-04-23T11:59:23+02:00 cfix: ChatBanner: Disable share button for PM contacts - - - - - 534f9f7e by Philipp Hörist at 2023-04-23T16:27:26+02:00 other: Regenerate man files with pandoc - - - - - b475635f by Philipp Hörist at 2023-04-23T16:27:26+02:00 change: Raise gajim when no cmdline options are provided - Remove the --show cmdline option because it is now obsolete Fixes #11482 - - - - - 92f92145 by Philipp Hörist at 2023-04-23T17:23:53+02:00 cfix: GroupchatRoster: Determine filtered path correctly Fixes #11480 - - - - - c6ad7550 by wurstsalat at 2023-04-23T18:58:43+02:00 imprv: GroupchatRoster: Highlight own nick and sort it to the top Fixes #11431 - - - - - 1d84d1b3 by wurstsalat at 2023-04-23T22:35:39+02:00 imprv: App menu: Add menu entry for privacy policy - - - - - 7bc116d6 by mjk at 2023-04-24T15:59:09+00:00 imprv: ChatStack: Only respond to supported drag-n-drop types while dragging - - - - - e0900133 by Philipp Hörist at 2023-04-24T22:14:21+02:00 cfix: GroupchatRoster: Open correct chat on row activate - - - - - e266a447 by Philipp Hörist at 2023-04-24T22:07:17+00:00 cfix: Revert: GroupChatRoster: Make scrollbar the right-most widget Putting a treeview inside a viewport seems to cause weird issues - - - - - 7f6bfeeb by wurstsalat at 2023-04-25T23:09:58+02:00 cfix: GroupchatRoster: Fix roster margins for scrollbar Fix for e266a44790ca07e598b5f559dfe5dab4338d67d0 Margins have to be set using GTK properties, since using GTK's CSS doesn't seem to have the same effect on treeviews. - - - - - 1a44795e by wurstsalat at 2023-04-25T23:37:29+02:00 fix: ContactInfo: Improve behavior for connection changes Fixes #11439 - - - - - 4a91ed1a by wurstsalat at 2023-04-26T09:23:19+02:00 cfix: OMEMOTrustManager: Improve fingerprint listing header - - - - - 2b075e32 by wurstsalat at 2023-04-26T19:22:53+02:00 fix: OMEMOTrustManager: Fix dialog transient for removing keys - - - - - ecf39613 by wurstsalat at 2023-04-26T19:35:27+02:00 fix: Ask for confirmation when leaving a MUC while offline Fixes #11487 - - - - - 9fdb3d18 by Daniel Brötzmann at 2023-04-28T07:08:54+00:00 imprv: StartChat: Don't filter for account labels Fixes #11494 - - - - - 17a0b4df by mjk at 2023-04-28T16:06:38+00:00 change: OMEMO verification: Generate URIs with pedantically correct query RFC 5122 requires a querytype to be present. `message` is the least probable one to break receiving clients. - - - - - 04412912 by mjk at 2023-04-28T16:06:38+00:00 fix: Escape JIDs for xmpp URIs everywhere - - - - - ebc1f377 by André Apitzsch at 2023-04-28T22:56:48+02:00 fix: Fix showing status icon on flatpak AppIndicator cannot access files within the flatpak container. - - - - - a7734f87 by André Apitzsch at 2023-04-29T09:30:04+02:00 fix: Fix access to GnuPG keys on flatpak Fixes gajim/gajim-plugins#621. - - - - - ca5f9660 by wurstsalat at 2023-04-29T13:19:36+02:00 fix: OMEMOTrustManager: Use date_time_format for last seen timestamp Fixes #11495 - - - - - 9574d19b by wurstsalat at 2023-04-29T16:48:55+02:00 fix: ContactInfo: Improve behavior for connection changes - - - - - 128be76c by wurstsalat at 2023-04-29T17:23:01+02:00 cfix: ContactInfo: Regenerate typing stubs - - - - - 939b53af by Philipp Hörist at 2023-05-03T22:01:20+02:00 refactor: Remove omemo.aes module Use the one provided by omemo-dr - - - - - f8ba3f06 by Philipp Hörist at 2023-05-03T22:01:20+02:00 refactor: Remove common.omemo module This module has been moved to omemo-dr - - - - - 9b8b1839 by Philipp Hörist at 2023-05-03T22:19:54+02:00 refactor: Adapt to omemo-dr changes - Rename method and variables to snake case - Let omemo-dr generate the keys - Add needs_init() - Fix return types for some storage methods - Remove obsolete database methods - - - - - fc692871 by wurstsalat at 2023-05-04T23:02:51+02:00 other: Windows: Fix installing omemo-dr in development environment Fixes #11490 - - - - - 05830ca1 by wurstsalat at 2023-05-05T21:14:55+02:00 cfix: OMEMOTrustManager: Call correct method for getting group members - - - - - ffa20aa0 by wurstsalat at 2023-05-05T21:15:39+02:00 cfix: OMEMOTrustManager: Improve readability for fingerprints - - - - - 60331ce5 by wurstsalat at 2023-05-05T23:13:58+02:00 fix: Fix rendering of copied code blocks and quotes Fixes #11499 - - - - - 8aa872b9 by wurstsalat at 2023-05-06T12:17:51+02:00 imprv: ChatList: Show indicator when joining group chat - - - - - 35b9ee28 by wurstsalat at 2023-05-06T21:21:59+02:00 imprv: ChatList: Show indicator if group chat is not connected - - - - - b13afcea by Philipp Hörist at 2023-05-06T21:39:01+02:00 refactor: OMEMO: Implement get_identity_infos() - Refactor KeyRow - - - - - 3a3ea83a by Philipp Hörist at 2023-05-06T23:44:36+02:00 refactor: OMEMO: Adapt to omemo-dr changes - - - - - 3c2c05f8 by wurstsalat at 2023-05-07T00:44:34+02:00 fix: XMLConsole: Select first account by default Fixes #11498 - - - - - ed697463 by Philipp Hörist at 2023-05-07T09:52:49+02:00 change: Enable spell checker by default - - - - - 4959e4db by Philipp Hörist at 2023-05-07T10:45:14+02:00 refactor: OMEMO: Change session import - - - - - 4489fffa by Philipp Hörist at 2023-05-07T10:45:48+02:00 refactor: OMEMO: Simplify deleting a session - - - - - 11e14286 by Philipp Hörist at 2023-05-07T10:48:45+02:00 refactor: OMEMO: Remove legacy code Code stems from a time where MAM archives did not communicate the real jid. - - - - - 3060641c by Philipp Hörist at 2023-05-07T10:54:43+02:00 refactor: OMEMO: Access set_trust() via SessionManager - - - - - 9719d42d by Philipp Hörist at 2023-05-07T11:12:38+02:00 refactor: OMEMO: Remove obsolete code - - - - - e55dcd4b by Philipp Hörist at 2023-05-07T12:35:28+02:00 refactor: OMEMO: Use get_identity_infos() in more places - - - - - 5aa9741e by Philipp Hörist at 2023-05-07T17:21:14+02:00 new: Attach omemo-dr logging to verbose mode - - - - - dcb304c5 by wurstsalat at 2023-05-07T21:00:57+02:00 cfix: ChatList: Use dim color for join icon - - - - - 3e1fa2e9 by Philipp Hörist at 2023-05-09T20:03:31+02:00 new: Client: Add convenience method for checking own JID - - - - - 0ecae706 by mjk at 2023-05-09T18:47:24+00:00 imprv: Notifications: Withdraw all when a corresponding chat is read Fixes #11030 - - - - - 4a68ce96 by Philipp Hörist at 2023-05-09T21:22:17+02:00 cfix: Fix own JID comparison - - - - - fa79e9be by Philipp Hörist at 2023-05-09T21:49:21+02:00 refactor: Chatstates: Simplify and use client attribute - - - - - eb0257bf by mjk at 2023-05-10T09:38:21+00:00 feat: JID sharing: Include verified OMEMO fingerprints - - - - - ef9479b9 by mjk at 2023-05-10T09:49:45+00:00 perf: QR codes: Avoid roundtrip to PNG in storage and back - - - - - c321a691 by Philipp Hörist at 2023-05-10T23:40:00+02:00 refactor: OMEMO: Adpat to changed API - - - - - 8694404e by Philipp Hörist at 2023-05-11T23:11:24+02:00 change: Remove "escape_key_closes" from ACE This setting is now available under Preferences -> Chat - - - - - 909bae91 by mjk at 2023-05-13T13:45:12+00:00 imprv: ACE: Make descriptions selectable and copyable - - - - - ff08ac13 by mjk at 2023-05-13T13:54:14+00:00 fix: ACE: Handle invalid numeric values gracefully - - - - - 63eb1041 by wurstsalat at 2023-05-13T22:33:58+02:00 imprv: Make contact details/settings available when offline - - - - - 1128a3db by Philipp Hörist at 2023-05-14T13:37:45+02:00 new: MAM: Add sync state signals - - - - - e205b303 by Philipp Hörist at 2023-05-14T11:38:57+00:00 imprv: ChatList: Improve sorting The sort of the chat list is inhibited when the mouse is over the chat list. This makes sure the sorting is invalidated once the mouse exits the chat list. - - - - - fa21ba4d by wurstsalat at 2023-05-14T14:42:34+00:00 new: Archive: Allow to create Archive in memory - - - - - 5784aa4a by wurstsalat at 2023-05-14T14:42:34+00:00 new: Tests: Add GUI test for ChatControl - - - - - 16618479 by wurstsalat at 2023-05-14T14:42:34+00:00 fix: ConversationView: Fix loading messages going forward from specific point Fixes #11201 - - - - - 3f8483c3 by Philipp Hörist at 2023-05-14T17:28:15+02:00 cfix: OMEMO: Remove JID from correct list after devicelist update - - - - - eeffaf9f by Philipp Hörist at 2023-05-14T21:21:48+02:00 new: Add lru cache decorate with ttl - - - - - bb78fa8b by Philipp Hörist at 2023-05-14T21:28:02+02:00 refactor: OMEMO: Simplify pre condition checks - Separate pre condition checks for group chats and single chats - Make more methods private - Use lru cache with ttl for device list and bundle queries - - - - - 49156380 by Philipp Hörist at 2023-05-14T21:35:09+02:00 refactor: OMEMO: Improve logging - - - - - 53f6e762 by Philipp Hörist at 2023-05-15T21:05:35+02:00 fix: Idle: Use default xa implemantation for XSS backend Fixes #11522 - - - - - 25500014 by Philipp Hörist at 2023-05-15T21:09:19+02:00 refactor: Idle: Remove unnecessary method override The base class has the same implementation - - - - - e145689e by Philipp Hörist at 2023-05-15T21:57:31+02:00 refactor: Idle: Make attributes private - - - - - 52d46908 by wurstsalat at 2023-05-18T00:33:50+02:00 imprv: GroupchatState: Show MAM sync - - - - - d88f7092 by Philipp Hörist at 2023-05-19T11:23:26+02:00 imprv: AboutDialog: Show libsoup version - - - - - cfddd3a1 by wurstsalat at 2023-05-19T19:11:06+02:00 fix: MessageWidget: Don't return truncated text for message actions Fixes #11526 - - - - - 2ecf8d46 by wurstsalat at 2023-05-19T19:33:37+02:00 fix: OMEMOTrustManager: Show correct JIDs for participant's keys Fixes #11530 - - - - - e3366360 by wurstsalat at 2023-05-19T22:11:18+02:00 fix: ChatActionProcessor: Allow to click items with mouse cursor Fixes #11445 - - - - - f2d22f6e by wurstsalat at 2023-05-19T23:50:53+02:00 fix: SearchView: Remove overlay Fixes #11412 - - - - - e1d063f2 by Philipp Hörist at 2023-05-20T20:13:13+02:00 refactor: Remove obsolete method - - - - - cf0c1981 by Philipp Hörist at 2023-05-20T20:13:13+02:00 refactor: Use helper methods to determine lib versions - - - - - c0c723e1 by Philipp Hörist at 2023-05-20T20:13:13+02:00 cfix: Add soup version to exception text - - - - - d1c80c84 by Philipp Hörist at 2023-05-20T20:39:26+02:00 new: OMEMO: Handle failed session build gracefully Fixes #11534 - - - - - 96bddaee by Philipp Hörist at 2023-05-20T21:57:25+02:00 new: Store logging records in memory - - - - - 2e6b9c5c by wurstsalat at 2023-05-21T11:35:55+02:00 cfix: Hide group chat roster when opening search bar - - - - - fc1a327f by wurstsalat at 2023-05-21T11:36:09+02:00 cfix: SearchView: Use correct padding for top edge - - - - - 0a922532 by wurstsalat at 2023-05-21T20:46:26+02:00 fix: SearchView: Don't change search context when switching chats - Simplify search context determination - Add fail-safe and improve GUI representation of context Fixes #11533 - - - - - 894938be by Philipp Hörist at 2023-05-21T22:14:47+02:00 new: Logging: Add callback for CustomStreamHandler - - - - - 2a338493 by Philipp Hörist at 2023-05-21T22:23:55+02:00 new: Logging: Add get_stream_handler() - - - - - e7aa6d3a by wurstsalat at 2023-05-21T22:24:55+02:00 imprv: XMLConsole: Always use dark theme - - - - - 5bab2f22 by wurstsalat at 2023-05-21T22:24:55+02:00 refactor: XMLConsole: Make attributes private - - - - - a7067ddb by wurstsalat at 2023-05-21T23:16:39+02:00 feat: XMLConsole: Add logging view - - - - - 25633186 by wurstsalat at 2023-05-21T23:42:54+02:00 cfix: CustomStreamHandler: Call super for emit() before working with LogRecords - - - - - e6241ffd by Philipp Hörist at 2023-05-21T23:49:19+02:00 other: Fix typo - - - - - 62ad4d8f by Philipp Hörist at 2023-05-21T23:50:54+02:00 cfix: XMLConsole: Unset callback on destroy - - - - - 54e1e89e by wurstsalat at 2023-05-21T23:56:57+02:00 cfix: XMLConsole: Fix typo in log formatting - - - - - a7c7b9d3 by wurstsalat at 2023-05-21T23:56:57+02:00 cfix: XMLConsole: Set filtering attributes correctly - - - - - 3bece8a3 by Philipp Hörist at 2023-05-22T00:24:30+02:00 refactor: Logging: Use separate handler for console log - - - - - 2b0e615e by wurstsalat at 2023-05-22T20:48:50+02:00 fix: AvatarSelector: Fix that images don't display after repeated loading - - - - - e0a207a9 by wurstsalat at 2023-05-22T20:49:55+02:00 fix: UI: Update avatar on muc-disco-update - - - - - 84fbaa87 by wurstsalat at 2023-05-22T21:41:45+02:00 imprv: ChatList: Clear row content when removing history Fixes #11420 - - - - - e73d1334 by wurstsalat at 2023-05-22T22:09:58+02:00 fix: Fix encryption deadlock with changed MUC configurations This disables encryption if MUC configuration changed and encryption is not applicable anymore Fixes #11421 - - - - - a7075aa0 by Philipp Hörist at 2023-05-22T22:44:39+02:00 other: Update .githooks - - - - - d896101a by Philipp Hörist at 2023-05-22T20:47:54+00:00 cfix: Revert: Update avatar on muc-disco-update - - - - - 8392372a by Philipp Hörist at 2023-05-23T00:34:23+02:00 refactor: Create contact cache per account - - - - - ae08c961 by mjk at 2023-05-23T19:06:31+00:00 fix: ChatActionProcessor: De-duplicate emojis - - - - - b8e51144 by wurstsalat at 2023-05-23T21:20:34+02:00 imprv: ChatBanner: Add share instructions - - - - - 688639bf by wurstsalat at 2023-05-23T21:40:29+02:00 cfix: ChatBanner: Fix text for contacts - - - - - 9807e28f by wurstsalat at 2023-05-23T22:15:10+02:00 fix: Exceptions: Fix sending reports via sentry in conjunction with proxy settings - - - - - 9f5633de by wurstsalat at 2023-05-23T23:45:16+02:00 imprv: Audio preview: Support more mime types - - - - - 037ddbdb by wurstsalat at 2023-05-25T11:43:16+02:00 fix: Message menu: Fix issue with chats not supplying correct ID - - - - - abff68be by Philipp Hörist at 2023-05-26T19:24:24+02:00 change: Raise nbxmpp version - - - - - 8e6188ce by Philipp Hörist at 2023-05-26T19:49:39+02:00 cfix: Raise omemo-dr version - - - - - 7e15ba0d by Philipp Hörist at 2023-05-26T19:57:44+02:00 ci: Adapt to release-helper changes - - - - - 4c7ddebc by Weblate at 2023-05-26T20:00:32+02:00 chore: Update translations - - - - - 30580132 by Philipp Hörist at 2023-05-26T20:11:35+02:00 chore: Update flatpak dependencies - - - - - 553be901 by Philipp Hörist at 2023-05-26T20:11:53+02:00 chore: Update IANA data - - - - - 8e8a78fb by wurstsalat at 2023-05-26T21:27:27+02:00 new: Return platform version details for Windows and MacOS when getting OS version - - - - - 89f316a8 by André Apitzsch at 2023-05-27T08:18:50+02:00 chore: Update flatpak dependencies - - - - - 732d381a by Philipp Hörist at 2023-05-27T09:41:05+02:00 fix: ContactInfo: Don’t fail when no vcard is set - - - - - a422f065 by André Apitzsch at 2023-05-27T11:11:55+02:00 fix: ProfileWindow: Don't fail when no vcard is set - - - - - 80d2f9f6 by Philipp Hörist at 2023-05-27T12:10:34+02:00 ci: Debian: Update control file - - - - - 754f9168 by Philipp Hörist at 2023-05-27T12:15:26+02:00 release: 1.8.0 - - - - - bd6c84ba by Philipp Hörist at 2023-05-27T13:58:45+02:00 other: Update git hook - - - - - 8986cb0c by Philipp Hörist at 2023-05-27T13:59:21+02:00 ci: Debian: Update control file - - - - - 17b9e7ac by Philipp Hörist at 2023-05-27T16:48:32+02:00 ci: Appveyor: Grab more commits on clone Otherwise we only can start builds for the last commit - - - - - 3baa6b33 by Philipp Hörist at 2023-05-27T17:28:13+02:00 refactor: Simplify launch.py - - - - - 4d3f632d by Philipp Hörist at 2023-05-27T17:31:59+02:00 cq: Use capitalized env var name - - - - - c5898f94 by Philipp Hörist at 2023-05-27T17:33:06+02:00 cq: Remove unnecessary list comprehension - - - - - 1de4921a by Philipp Hörist at 2023-05-27T23:03:47+02:00 cq: Ignore false positive ruff error - - - - - ffe5bdd0 by Philipp Hörist at 2023-05-27T23:03:47+02:00 refactor: JingleRTP: Don’t call external process for pipeline debug - - - - - b230d06a by Philipp Hörist at 2023-05-27T23:03:47+02:00 cq: Update ruff version - - - - - 04ea001d by Philipp Hörist at 2023-05-27T23:50:57+02:00 cq: Raise pyright version - - - - - 9a7f27ea by Philipp Hörist at 2023-05-27T23:51:37+02:00 cq: GajimPlugin: Add type annotation - - - - - dc0e2469 by Philipp Hörist at 2023-05-28T14:49:49+02:00 cq: Use union operator everywhere - - - - - 71f94434 by wurstsalat at 2023-05-28T16:16:55+02:00 fix: Windows themes: Don't fail hard when winsdk UISettings are not available Fixes #11542 - - - - - 9aaf4f9d by wurstsalat at 2023-05-28T16:40:58+02:00 imprv: Account page: Show our XMPP address - - - - - ca7e09da by wurstsalat at 2023-05-28T16:52:35+02:00 fix: Search: Restore group chat participants list to previous state when closing search Fixes #11536 - - - - - 317d1447 by wurstsalat at 2023-05-28T16:55:55+02:00 cfix: Account page: Enable copying for our XMPP address label - - - - - acf0c8f6 by wurstsalat at 2023-05-28T19:51:44+02:00 imprv: Preview: Add loading placeholder Fixes #11264 - - - - - 79f00321 by wurstsalat at 2023-05-28T19:56:17+02:00 cfix: Preview: Add back preview_box - - - - - ed674b8c by Philipp Hörist at 2023-05-28T21:12:04+02:00 cq: Simplify string formatting - - - - - fbb470b7 by Philipp Hörist at 2023-05-28T21:12:32+02:00 refactor: Add util methods for sha formatting - - - - - 173d6f78 by Philipp Hörist at 2023-05-28T21:16:52+02:00 refactor: SystemStyle: Move code into helper method - - - - - a4cacbfa by Philipp Hörist at 2023-05-28T21:19:39+02:00 cq: Avoid extraneous parentheses - - - - - 6e9eab11 by Philipp Hörist at 2023-05-28T21:21:11+02:00 cq: Import from collections.abc instead from typing - - - - - 5a9362fd by Philipp Hörist at 2023-05-28T21:23:36+02:00 cq: Use union operator in ininstance() calls - - - - - af4223a9 by Philipp Hörist at 2023-05-28T21:30:32+02:00 cq: Use f-string instead of `format` call - - - - - 9b44d769 by wurstsalat at 2023-05-28T22:39:27+02:00 cfix: Search: Restore group chat participants list to previous state when closing search via Escape Fixes #11536 - - - - - bbc6c55d by wurstsalat at 2023-05-29T00:37:27+02:00 fix: GroupchatManage: Improve checks for joined state Fixes #11231 - - - - - ae5ac2d3 by Philipp Hörist at 2023-05-29T11:43:30+02:00 refactor: Rename main application entry points - - - - - 32601f1c by Philipp Hörist at 2023-05-29T11:43:30+02:00 fix: Init plugin translation module later the plugins_i18n module needs to be imported after configpaths.init() has been called, otherwise the correct locale dir is not found - - - - - c45fbdd8 by Philipp Hörist at 2023-05-29T11:43:30+02:00 refactor: Allow to import i18n module without side effects - Add new method for translation - Remove stderr if translations are missing - - - - - 238ac329 by Philipp Hörist at 2023-05-29T12:31:45+02:00 cfix: I18n: Install NullTranslation on module init - - - - - 915a9f0f by wurstsalat at 2023-05-30T23:26:53+02:00 fix: Fix interaction of GroupchatRoster and SearchView Fixes #11546 - - - - - d639b32d by wurstsalat at 2023-06-02T14:35:54+02:00 fix: OMEMOTrustManager: React correctly to connection changes Fixes #11547 - - - - - f2c514f3 by wurstsalat at 2023-06-05T19:54:11+02:00 fix: Fix showing MAM sync errors and show error text - - - - - 17a65362 by Philipp Hörist at 2023-06-06T14:05:32+02:00 fix: ChatListRow: Always update group chat name - - - - - 3b6c82b9 by Philipp Hörist at 2023-06-06T15:04:39+02:00 refactor: Use contact signals instead of event signals - - - - - 126babff by Philipp Hörist at 2023-06-06T18:36:14+02:00 fix: DataForm: Handle destroy correctly Fixes #11548 - - - - - af23279d by wurstsalat at 2023-06-06T21:21:12+02:00 cq: Tests: Make type check pass for SSLErrorDialog and CertificateDialog - - - - - 2f6211c0 by Philipp Hörist at 2023-06-07T00:02:38+02:00 new: MUC: Store occupant-id - - - - - 8d6181cb by wurstsalat at 2023-06-07T12:54:35+00:00 imprv: Preview: Always show preview widget Fixes #11427 - - - - - e09866e4 by Philipp Hörist at 2023-06-07T18:19:23+02:00 new: MUC: Store real jid for messages - - - - - 4f7f2823 by wurstsalat at 2023-06-07T18:45:21+02:00 feat: Add support for XEP-0461: Message Replies - - - - - 30 changed files: - .ci/appveyor.yml - .githooks/update - .gitlab-ci.yml - .gitlab/issue_templates/Release.md - .pre-commit-config.yaml - CONTRIBUTING.md - ChangeLog - README.md - data/gajim-remote.1 - data/gajim.1 - data/gajim.1.md - data/gajim.doap - data/org.gajim.Gajim.appdata.xml.in - debian/control - debian/patches/remove-nbxmpp-from-deps.patch - flatpak/README.md - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/app.py - gajim/common/application.py - gajim/common/call_manager.py - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/commands.py - gajim/common/configpaths.py - gajim/common/const.py - gajim/common/dbus/file_manager.py - gajim/common/dbus/location.py - gajim/common/dbus/logind.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e28240c32956f4292a941df1b4e8c29… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e28240c32956f4292a941df1b4e8c29… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: MUC: Store real jid for messages
by Philipp Hörist (＠lovetox) 07 Jun '23

07 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e09866e4 by Philipp Hörist at 2023-06-07T18:19:23+02:00 new: MUC: Store real jid for messages - - - - - 3 changed files: - gajim/common/events.py - gajim/common/modules/mam.py - gajim/common/modules/message.py Changes: ===================================== gajim/common/events.py ===================================== @@ -399,6 +399,7 @@ class MamMessageReceived(ApplicationEvent): archive_jid: str kind: KindConstant occupant_id: str | None + real_jid: JID | None @dataclass @@ -424,6 +425,7 @@ class MessageReceived(ApplicationEvent): class GcMessageReceived(MessageReceived): name: str = field(init=False, default='gc-message-received') room_jid: str + real_jid: JID | None occupant_id: str | None ===================================== gajim/common/modules/mam.py ===================================== @@ -300,6 +300,7 @@ def _mam_message_received(self, stanza_id = message_id occupant_id = self._get_occupant_id(properties) + real_jid = self._get_real_jid(properties) event_attr: dict[str, Any] = { 'account': self._account, @@ -312,6 +313,7 @@ def _mam_message_received(self, 'archive_jid': properties.mam.archive, 'kind': kind, 'occupant_id': occupant_id, + 'real_jid': real_jid, } if check_if_message_correction(properties, @@ -323,7 +325,6 @@ def _mam_message_received(self, self._log): return - app.storage.archive.insert_into_logs( self._account, jid, @@ -334,10 +335,21 @@ def _mam_message_received(self, additional_data=additional_data, stanza_id=stanza_id, message_id=properties.id, - occupant_id=occupant_id) + occupant_id=occupant_id, + real_jid=real_jid, + ) app.ged.raise_event(MamMessageReceived(**event_attr)) + def _get_real_jid(self, properties: MessageProperties) -> JID | None: + if not properties.type.is_groupchat: + return None + + if properties.muc_user is None: + return None + + return properties.muc_user.jid + def _get_occupant_id(self, properties: MessageProperties) -> str | None: if not properties.type.is_groupchat: return None ===================================== gajim/common/modules/message.py ===================================== @@ -22,6 +22,7 @@ import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID from nbxmpp.structs import MessageProperties from nbxmpp.structs import StanzaHandler from nbxmpp.util import generate_id @@ -35,6 +36,7 @@ from gajim.common.events import RawMessageReceived from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.base import BaseModule +from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml from gajim.common.modules.util import check_if_message_correction @@ -199,8 +201,11 @@ def _message_received(self, # Only store occupant-id if MUC announces support occupant_id = properties.occupant_id + real_jid = self._get_real_jid(properties) + event_attr.update({ 'room_jid': jid, + 'real_jid': real_jid, 'occupant_id': occupant_id, }) @@ -269,7 +274,8 @@ def _log_muc_message(self, event: GcMessageReceived) -> int | None: additional_data=event.additional_data, stanza_id=event.stanza_id, message_id=event.properties.id, - occupant_id=event.occupant_id) + occupant_id=event.occupant_id, + real_Jid=event.real_jid) return msg_log_id return None @@ -279,6 +285,18 @@ def _check_for_mam_compliance(self, room_jid: str, stanza_id: str) -> None: if stanza_id is None and disco_info.mam_namespace == Namespace.MAM_2: self._log.warning('%s announces mam:2 without stanza-id', room_jid) + def _get_real_jid(self, properties: MessageProperties) -> JID | None: + if not properties.type.is_groupchat: + return None + + if not properties.jid.is_full: + return None + + participant = self._client.get_module('Contacts').get_contact( + properties.jid, groupchat=True) + assert isinstance(participant, GroupchatParticipant) + return participant.real_jid + def _get_unique_id(self, properties: MessageProperties ) -> tuple[str | None, str | None]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e09866e4eb0b1ddf3f32a129e75172e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e09866e4eb0b1ddf3f32a129e75172e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preview: Always show preview widget
by Philipp Hörist (＠lovetox) 07 Jun '23

07 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8d6181cb by wurstsalat at 2023-06-07T12:54:35+00:00 imprv: Preview: Always show preview widget Fixes #11427 - - - - - 3 changed files: - gajim/common/preview.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -306,7 +306,12 @@ def _accept_uri(urlparts: ParseResult, def is_previewable(self, text: str, - additional_data: AdditionalDataDict) -> bool: + additional_data: AdditionalDataDict | None + ) -> bool: + + if additional_data is None: + return False + if not IRI_RX.fullmatch(text): # urlparse removes whitespace (and who knows what else) from URLs, # so can't be used for validation. @@ -336,6 +341,7 @@ def create_preview(self, from_us: bool, context: str | None = None ) -> None: + if uri.startswith('geo:'): preview = Preview(uri, None, None, None, 96, widget) preview.update_widget() @@ -345,6 +351,10 @@ def create_preview(self, preview = self._process_web_uri(uri, widget, from_us, context) self._previews[preview.id] = preview + if not app.settings.get('enable_file_preview'): + preview.update_widget() + return + if not preview.orig_exists: if context is not None and not from_us: allow_in_public = app.settings.get('preview_anonymous_muc') @@ -555,6 +565,10 @@ def _on_finished(self, request: HTTPRequest) -> None: self._on_orig_write_finished, preview) + if not app.settings.get('enable_file_preview'): + preview.update_widget() + return + if preview.is_previewable: if preview.create_thumbnail(data): write_file_async(preview.thumb_path, ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -106,13 +106,7 @@ def __init__(self, else: from_us = kind == 'outgoing' - is_previewable = False - preview_enabled = app.settings.get('enable_file_preview') - if additional_data is not None and preview_enabled: - is_previewable = app.preview_manager.is_previewable( - text, additional_data) - - if is_previewable: + if app.preview_manager.is_previewable(text, additional_data): muc_context = None if isinstance(self._contact, GroupchatContact | GroupchatParticipant): ===================================== gajim/gtk/preview.py ===================================== @@ -142,7 +142,9 @@ def update(self, preview: Preview, data: GdkPixbufType | None) -> None: self._ui.preview_box.set_size_request(160, -1) return - if preview.is_previewable and preview.orig_exists: + preview_enabled = app.settings.get('enable_file_preview') + + if preview_enabled and preview.is_previewable and preview.orig_exists: self._ui.icon_event_box.hide() self._ui.image_button.show() self._ui.save_as_button.show() @@ -170,11 +172,16 @@ def update(self, preview: Preview, data: GdkPixbufType | None) -> None: self._ui.info_message.show() if preview.orig_exists: + if preview_enabled: + self._ui.link_button.hide() + self._ui.download_button.hide() self._ui.open_folder_button.show() self._ui.save_as_button.show() - self._ui.link_button.hide() - if (preview.orig_path is not None and preview.is_audio and + + if (preview_enabled and + preview.orig_path is not None and + preview.is_audio and app.is_installed('GST') and contains_audio_streams(preview.orig_path)): self._ui.image_button.hide() @@ -183,7 +190,10 @@ def update(self, preview: Preview, data: GdkPixbufType | None) -> None: self._ui.right_box.reorder_child(audio_widget, 1) else: if preview.file_size == 0: - self._ui.download_button.hide() + if preview_enabled: + self._ui.download_button.hide() + else: + self._ui.download_button.show() self._ui.link_button.show() else: self._ui.download_button.show() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8d6181cb82f2f449bf7e54f56c7527af… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8d6181cb82f2f449bf7e54f56c7527af… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: MUC: Store occupant-id
by Philipp Hörist (＠lovetox) 06 Jun '23

06 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2f6211c0 by Philipp Hörist at 2023-06-07T00:02:38+02:00 new: MUC: Store occupant-id - - - - - 6 changed files: - gajim/common/events.py - gajim/common/modules/contacts.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/structs.py Changes: ===================================== gajim/common/events.py ===================================== @@ -398,6 +398,7 @@ class MamMessageReceived(ApplicationEvent): stanza_id: str archive_jid: str kind: KindConstant + occupant_id: str | None @dataclass @@ -423,6 +424,7 @@ class MessageReceived(ApplicationEvent): class GcMessageReceived(MessageReceived): name: str = field(init=False, default='gc-message-received') room_jid: str + occupant_id: str | None @dataclass ===================================== gajim/common/modules/contacts.py ===================================== @@ -971,6 +971,10 @@ def update_avatar(self, *args: Any) -> None: def type_string(self) -> str: return 'pm' + @property + def occupant_id(self) -> str | None: + return self._presence.occupant_id + def can_add_to_roster( contact: BareContact | GroupchatContact | GroupchatParticipant ===================================== gajim/common/modules/mam.py ===================================== @@ -299,6 +299,8 @@ def _mam_message_received(self, return stanza_id = message_id + occupant_id = self._get_occupant_id(properties) + event_attr: dict[str, Any] = { 'account': self._account, 'jid': jid, @@ -309,6 +311,7 @@ def _mam_message_received(self, 'stanza_id': stanza_id, 'archive_jid': properties.mam.archive, 'kind': kind, + 'occupant_id': occupant_id, } if check_if_message_correction(properties, @@ -320,6 +323,7 @@ def _mam_message_received(self, self._log): return + app.storage.archive.insert_into_logs( self._account, jid, @@ -329,10 +333,24 @@ def _mam_message_received(self, contact_name=properties.muc_nickname, additional_data=additional_data, stanza_id=stanza_id, - message_id=properties.id) + message_id=properties.id, + occupant_id=occupant_id) app.ged.raise_event(MamMessageReceived(**event_attr)) + def _get_occupant_id(self, properties: MessageProperties) -> str | None: + if not properties.type.is_groupchat: + return None + + if properties.occupant_id is None: + return None + + contact = self._client.get_module('Contacts').get_contact( + properties.jid.bare, groupchat=True) + if contact.supports(Namespace.OCCUPANT_ID): + return properties.occupant_id + return None + def _is_valid_request(self, properties: MessageProperties) -> bool: valid_id = self._mam_query_ids.get(properties.mam.archive, None) return valid_id == properties.mam.query_id ===================================== gajim/common/modules/message.py ===================================== @@ -192,8 +192,16 @@ def _message_received(self, if not msgtxt: return + occupant_id = None + group_contact = self._client.get_module('Contacts').get_contact( + jid, groupchat=True) + if group_contact.supports(Namespace.OCCUPANT_ID): + # Only store occupant-id if MUC announces support + occupant_id = properties.occupant_id + event_attr.update({ 'room_jid': jid, + 'occupant_id': occupant_id, }) event = GcMessageReceived(**event_attr) @@ -260,7 +268,8 @@ def _log_muc_message(self, event: GcMessageReceived) -> int | None: contact_name=event.properties.muc_nickname, additional_data=event.additional_data, stanza_id=event.stanza_id, - message_id=event.properties.id) + message_id=event.properties.id, + occupant_id=event.occupant_id) return msg_log_id return None ===================================== gajim/common/modules/muc.py ===================================== @@ -759,8 +759,15 @@ def _process_occupant_presence_change( def _process_user_presence(self, properties: PresenceProperties ) -> MUCPresenceData: + jid = properties.jid - muc_presence = MUCPresenceData.from_presence(properties) + group_contact = self._client.get_module('Contacts').get_contact( + jid.bare, groupchat=True) + occupant_id = None + if group_contact.supports(Namespace.OCCUPANT_ID): + occupant_id = properties.occupant_id + + muc_presence = MUCPresenceData.from_presence(properties, occupant_id) if not muc_presence.available: self._joined_users[jid.bare].pop(jid.resource) else: ===================================== gajim/common/structs.py ===================================== @@ -237,16 +237,22 @@ class MUCPresenceData: affiliation: Affiliation role: Role real_jid: JID | None + occupant_id: str | None @classmethod - def from_presence(cls, properties: PresenceProperties) -> MUCPresenceData: + def from_presence(cls, + properties: PresenceProperties, + occupant_id: str | None + ) -> MUCPresenceData: + return cls(show=properties.show, status=properties.status, idle_time=properties.idle_timestamp, available=properties.type.is_available, affiliation=properties.muc_user.affiliation, role=properties.muc_user.role, - real_jid=properties.muc_user.jid) + real_jid=properties.muc_user.jid, + occupant_id=occupant_id) UNKNOWN_MUC_PRESENCE = MUCPresenceData(show=PresenceShowExt.OFFLINE, @@ -255,7 +261,8 @@ def from_presence(cls, properties: PresenceProperties) -> MUCPresenceData: available=False, affiliation=Affiliation.NONE, role=Role.NONE, - real_jid=None) + real_jid=None, + occupant_id=None) class VariantMixin: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2f6211c045e06f7f60e11539d5ba09a5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2f6211c045e06f7f60e11539d5ba09a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Tests: Make type check pass for SSLErrorDialog and CertificateDialog
by Daniel Brötzmann (＠wurstsalat) 06 Jun '23

06 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: af23279d by wurstsalat at 2023-06-06T21:21:12+02:00 cq: Tests: Make type check pass for SSLErrorDialog and CertificateDialog - - - - - 3 changed files: - pyproject.toml - test/dialogs/certificate_dialog.py - test/dialogs/ssl_error_dialog.py Changes: ===================================== pyproject.toml ===================================== @@ -103,11 +103,9 @@ exclude = [ "gajim/plugins/pluginmanager.py", "scripts/update_flatpak_manifest.py", "test/common/test_uri_util.py", - "test/dialogs/certificate_dialog.py", "test/dialogs/change_password.py", "test/dialogs/dataform.py", "test/dialogs/groupchat_info.py", - "test/dialogs/ssl_error_dialog.py", "test/gui/test_menus.py", "test/gui/test_nick_completion.py", ] ===================================== test/dialogs/certificate_dialog.py ===================================== @@ -44,7 +44,7 @@ -----END CERTIFICATE-----''' gio_cert = Gio.TlsCertificate.new_from_pem(cert, -1) -win = CertificateDialog(None, 'testacc', gio_cert) +win = CertificateDialog(Gtk.Window(), 'testacc', gio_cert) win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main() ===================================== test/dialogs/ssl_error_dialog.py ===================================== @@ -1,3 +1,5 @@ +from typing import cast + from unittest.mock import MagicMock from gi.repository import Gio @@ -49,11 +51,14 @@ app.settings = MagicMock() app.settings.get_account_setting = MagicMock( - return_value=['myhost(a)example.tld']) + return_value='myhost(a)example.tld') gio_cert = Gio.TlsCertificate.new_from_pem(cert, -1) -ssl_error_num = 10 -win = SSLErrorDialog('testacc', None, gio_cert, ssl_error_num) +# Listing of Gio.TlsCertificateFlags: +# https://lazka.github.io/pgi-docs/#Gio-2.0/flags.html#Gio.TlsCertificateFlags +ssl_error_num = cast(Gio.TlsCertificateFlags, 10) + +win = SSLErrorDialog('testacc', MagicMock(), gio_cert, ssl_error_num) win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af23279d95c58bdb2c335b55e0e396e1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/af23279d95c58bdb2c335b55e0e396e1… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2023