Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] 4 commits: fix: Add missing __init__.py to examples
by Philipp Hörist (＠lovetox) 06 Sep '22

06 Sep '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c5ee15c1 by Philipp Hörist at 2022-09-06T20:06:41+02:00 fix: Add missing __init__.py to examples This makes `python -m nbxmpp.examples.client` work - - - - - 88617bc1 by Philipp Hörist at 2022-09-06T21:41:46+02:00 feat: Expose TLS version and ciphersuite - - - - - c78455d0 by Philipp Hörist at 2022-09-06T21:47:13+02:00 change: Add packaging as dependency - - - - - e9c38fe4 by Philipp Hörist at 2022-09-06T21:47:30+02:00 ci: Update debian control file - - - - - 9 changed files: - README.md - debian/control - nbxmpp/client.py - nbxmpp/connection.py - nbxmpp/const.py - + nbxmpp/examples/__init__.py - nbxmpp/tcp.py - nbxmpp/util.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -9,6 +9,7 @@ - GLib >= 2.60 - libsoup - precis-i18n +- packaging - idna ## Optional Runtime Requirements ===================================== debian/control ===================================== @@ -1,15 +1,16 @@ Source: python3-nbxmpp-nightly -Section: python +Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> -Build-Depends: debhelper-compat (= 13), +Build-Depends: + debhelper (>= 13), dh-python, libglib2.0-0 (>= 2.60), gir1.2-soup-2.4, python3-all, python3-gi, - python3-gssapi, python3-idna, + python3-packaging, python3-precis-i18n, python3-setuptools, Standards-Version: 4.1.4 @@ -22,10 +23,14 @@ Package: python3-nbxmpp-nightly Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, + libglib2.0-0 (>= 2.60), gir1.2-soup-2.4, - python3-gi + python3-gi, + python3-idna, + python3-packaging, + python3-precis-i18n, Recommends: python3-gssapi, Breaks: gajim (<< 1.4~) Description: Non blocking XMPP Python library - nbxmpp is a Python library that provides a way for Python applications - to use the XMPP network. This library was initially a fork of xmpppy. + python-nbxmpp is a Python library that provides a way for Python applications + to use the XMPP network. This library was initially a fork of xmpppy. \ No newline at end of file ===================================== nbxmpp/client.py ===================================== @@ -212,6 +212,14 @@ class Client(Observable): def ignore_tls_errors(self): return self._ignore_tls_errors + @property + def tls_version(self): + return self._con.tls_version + + @property + def ciphersuite(self): + return self._con.ciphersuite + def set_ignore_tls_errors(self, ignore): self._ignore_tls_errors = ignore ===================================== nbxmpp/connection.py ===================================== @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +from typing import Optional + import logging from gi.repository import Gio @@ -65,6 +67,14 @@ class Connection(Observable): self._ignore_tls_errors = ignore_tls_errors self._ignored_tls_errors = ignored_tls_errors + @property + def tls_version(self) -> Optional[int]: + return None + + @property + def ciphersuite(self) -> Optional[int]: + return None + @property def local_address(self): return self._local_address ===================================== nbxmpp/const.py ===================================== @@ -19,7 +19,14 @@ from enum import Enum from enum import IntEnum from functools import total_ordering +from packaging.version import Version + from gi.repository import Gio +from gi.repository import GLib + + +GLIB_VERSION = Version( + f'{GLib.MAJOR_VERSION}.{GLib.MINOR_VERSION}.{GLib.MICRO_VERSION}') class IqType(Enum): ===================================== nbxmpp/examples/__init__.py ===================================== ===================================== nbxmpp/tcp.py ===================================== @@ -17,6 +17,7 @@ import logging from collections import deque +from typing import Optional from gi.repository import GLib from gi.repository import Gio @@ -26,6 +27,7 @@ from nbxmpp.const import TCPState from nbxmpp.const import ConnectionType from nbxmpp.util import utf8_decode from nbxmpp.util import convert_tls_error_flags +from nbxmpp.util import min_version from nbxmpp.connection import Connection log = logging.getLogger('nbxmpp.tcp') @@ -62,6 +64,24 @@ class TCPConnection(Connection): self._keepalive_id = None + @property + def tls_version(self) -> Optional[int]: + if self._con is None: + return None + + if min_version('GLib', '2.69.0'): + tls_con = self._con.get_base_io_stream() + return tls_con.get_protocol_version() + + @property + def ciphersuite(self) -> Optional[int]: + if self._con is None: + return None + + if min_version('GLib', '2.69.0'): + tls_con = self._con.get_base_io_stream() + return tls_con.get_ciphersuite_name() + def connect(self): self.state = TCPState.CONNECTING ===================================== nbxmpp/util.py ===================================== @@ -31,13 +31,15 @@ import logging from logging import LoggerAdapter from collections import defaultdict import xml.etree.ElementTree as ET - from functools import lru_cache +from packaging.version import Version + from gi.repository import Gio from nbxmpp.protocol import DiscoInfoMalformed from nbxmpp.const import GIO_TLS_ERRORS +from nbxmpp.const import GLIB_VERSION from nbxmpp.namespaces import Namespace from nbxmpp.protocol import StanzaMalformed from nbxmpp.protocol import StreamHeader @@ -405,6 +407,12 @@ def is_websocket_stream_error(stanza: Node) -> bool: stanza.getNamespace() == Namespace.STREAMS) +def min_version(name: str, min_version: str) -> bool: + if name == 'GLib': + return GLIB_VERSION >= Version(min_version) + raise ValueError('Unknown library name') + + class Observable: def __init__(self, log_: logging.Logger): self._log = log_ ===================================== setup.cfg ===================================== @@ -18,6 +18,7 @@ python_requires = >=3.9 packages = find: install_requires = precis-i18n>=1.0.0 + packaging idna [options.extras_require] View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/1cc53fba4101075f5d9c95b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/1cc53fba4101075f5d9c95b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Remove dead code
by Philipp Hörist (＠lovetox) 05 Sep '22

05 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7cf3fbd3 by Philipp Hörist at 2022-09-05T22:37:23+02:00 refactor: Remove dead code - - - - - 2b123a75 by Philipp Hörist at 2022-09-05T22:42:42+02:00 cfix: Don’t expose hide_groupchat_occupants_list in advanced settings This is an internal setting that holds the toggle state of the groupchat roster - - - - - 5 changed files: - gajim/common/const.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/setting_values.py - gajim/common/storage/archive.py Changes: ===================================== gajim/common/const.py ===================================== @@ -113,16 +113,6 @@ def __str__(self): return str(self.value) -@unique -class ShowConstant(IntEnum): - ONLINE = 0 - CHAT = 1 - AWAY = 2 - XA = 3 - DND = 4 - OFFLINE = 5 - - @unique class TypeConstant(IntEnum): AIM = 0 ===================================== gajim/common/modules/muc.py ===================================== @@ -26,7 +26,6 @@ import nbxmpp from nbxmpp.const import InviteType -from nbxmpp.const import PresenceType from nbxmpp.const import StatusCode from nbxmpp.errors import StanzaError from nbxmpp.modules.dataforms import SimpleDataForm @@ -48,13 +47,12 @@ from gajim.common import events from gajim.common import helpers from gajim.common import types -from gajim.common.const import ClientState, KindConstant +from gajim.common.const import ClientState from gajim.common.const import MUCJoinedState from gajim.common.events import MessageModerated from gajim.common.events import MucAdded from gajim.common.events import MucDecline from gajim.common.events import MucInvitation -from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config from gajim.common.helpers import get_group_chat_nick from gajim.common.structs import MUCData @@ -814,42 +812,6 @@ def _remove_join_timeout(self, room_jid: str) -> None: GLib.source_remove(id_) del self._join_timeouts[room_jid] - def _log_muc_event(self, - event_name: str, - properties: PresenceProperties - ) -> None: - # TODO CURRENTLY NOT USED - if event_name not in ['muc-user-joined', - 'muc-user-left', - 'muc-user-status-show-changed']: - return - - if not app.settings.get('log_contact_status_changes'): - return - - additional_data = AdditionalDataDict() - if properties.muc_user is not None: - if properties.muc_user.jid is not None: - additional_data.set_value( - 'gajim', 'real_jid', str(properties.muc_user.jid)) - - # TODO: Refactor - if properties.type == PresenceType.UNAVAILABLE: - show = 'offline' - else: - show = properties.show.value - show = app.storage.archive.convert_show_values_to_db_api_values(show) - - app.storage.archive.insert_into_logs( - self._account, - properties.jid.bare, - properties.timestamp, - KindConstant.GCSTATUS, - contact_name=properties.muc_nickname, - message=properties.status or None, - show=show, - additional_data=additional_data) - def _on_subject_change(self, _con: types.xmppClient, _stanza: Message, ===================================== gajim/common/modules/presence.py ===================================== @@ -38,8 +38,6 @@ from gajim.common.events import UnsubscribedPresenceReceived from gajim.common.i18n import _ from gajim.common.structs import PresenceData -from gajim.common.const import KindConstant -from gajim.common.const import ShowConstant from gajim.common.modules.base import BaseModule @@ -156,23 +154,6 @@ def _presence_received(self, app.ged.raise_event(PresenceReceived(**event_attrs)) - self._log_presence(properties) - - def _log_presence(self, properties: PresenceProperties) -> None: - if not app.settings.get('log_contact_status_changes'): - return - - show = ShowConstant[properties.show.name] - if properties.type.is_unavailable: - show = ShowConstant.OFFLINE - - app.storage.archive.insert_into_logs(self._account, - properties.jid.bare, - time.time(), - KindConstant.STATUS, - message=properties.status, - show=show) - def _subscribe_received(self, _con: types.xmppClient, _stanza: nbxmpp.protocol.Presence, ===================================== gajim/common/setting_values.py ===================================== @@ -63,7 +63,6 @@ class _ACCOUNT_DEFAULT: 'hide_groupchat_occupants_list', 'ignore_incoming_attention', 'is_window_visible', - 'log_contact_status_changes', 'muc_prefer_direct_msg', 'notification_preview_message', 'notify_on_all_muc_messages', @@ -221,7 +220,6 @@ class _ACCOUNT_DEFAULT: 'last_sounds_dir': '', 'last_update_check': '', 'latest_disco_addresses': '', - 'log_contact_status_changes': False, 'mainwin_height': 500, 'mainwin_width': 1000, 'mainwin_x_position': 0, @@ -676,12 +674,9 @@ class WorkspaceSettings(TypedDict): 'groupchat_roster_width': _('Width of group chat roster in pixel'), 'hide_chat_banner': _('Hides the banner in a 1:1 chat window.'), 'hide_groupchat_banner': _('Hides the banner in a group chat window.'), - 'hide_groupchat_occupants_list': _( - 'Hides the group chat participants list in a group chat window.'), 'ignore_incoming_attention': _( 'If enabled, Gajim will ignore incoming attention ' 'requests ("wizz").'), - 'log_contact_status_changes': '', 'muc_highlight_words': _( 'A list of words (semicolon separated) that will be ' 'highlighted in group chats.'), ===================================== gajim/common/storage/archive.py ===================================== @@ -43,7 +43,6 @@ from gajim.common import configpaths from gajim.common.helpers import AdditionalDataDict from gajim.common.const import MAX_MESSAGE_CORRECTION_DELAY -from gajim.common.const import ShowConstant from gajim.common.const import KindConstant from gajim.common.const import JIDConstant @@ -340,31 +339,6 @@ def get_jid_id(self, self._delayed_commit() return lastrowid - @staticmethod - def convert_show_values_to_db_api_values(show: Optional[str] - ) -> Optional[ShowConstant]: - ''' - Convert from string style to constant ints for db - ''' - - if show == 'online': - return ShowConstant.ONLINE - if show == 'chat': - return ShowConstant.CHAT - if show == 'away': - return ShowConstant.AWAY - if show == 'xa': - return ShowConstant.XA - if show == 'dnd': - return ShowConstant.DND - if show == 'offline': - return ShowConstant.OFFLINE - if show is None: - return ShowConstant.ONLINE - # invisible in GC when someone goes invisible - # it's a RFC violation .... but we should not crash - return None - @timeit def get_conversation_before_after(self, account: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b380d4c5ab1033f0b9e15eb150d237b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b380d4c5ab1033f0b9e15eb150d237b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: Migration: Make archive migation more resilient
by Philipp Hörist (＠lovetox) 04 Sep '22

04 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f08e1696 by Philipp Hörist at 2022-09-04T23:26:12+02:00 imprv: Migration: Make archive migation more resilient - - - - - b380d4c5 by Philipp Hörist at 2022-09-04T23:49:57+02:00 refactor: Remove unused code - - - - - 2 changed files: - gajim/common/storage/archive.py - gajim/gtk/control.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -222,7 +222,7 @@ def _migrate(self) -> None: )''', '''CREATE INDEX IF NOT EXISTS idx_logs_stanza_id - ON logs(stanza_id)''', + ON logs(stanza_id)''', 'PRAGMA user_version=1' ] @@ -252,7 +252,8 @@ def _migrate(self) -> None: if user_version < 5: statements = [ - 'CREATE INDEX idx_logs_message_id ON logs (message_id)', + '''CREATE INDEX IF NOT EXISTS idx_logs_message_id + ON logs (message_id)''', 'PRAGMA user_version=5' ] self._execute_multiple(statements) ===================================== gajim/gtk/control.py ===================================== @@ -1169,6 +1169,3 @@ def _on_room_subject(self, if (app.settings.get('show_subject_on_join') or not contact.is_joining): self.conversation_view.add_muc_subject(subject) - - def rejoin(self) -> None: - self.client.get_module('MUC').join(self.contact.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/91cb768eb2173ce27492571fdf72125… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/91cb768eb2173ce27492571fdf72125… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: Add chat event storage
by Philipp Hörist (＠lovetox) 04 Sep '22

04 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 91cb768e by Philipp Hörist at 2022-09-04T16:31:21+00:00 new: Add chat event storage This allows us to store events like group chat joins/lefts or other info messages. This way we can load them on chat switch and they don’t get lost. - - - - - 14 changed files: - gajim/common/app.py - gajim/common/application.py - gajim/common/events.py - gajim/common/modules/muc.py - gajim/common/storage/base.py - + gajim/common/storage/events.py - gajim/gtk/chat_banner.py - gajim/gtk/chat_stack.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_nick_completion.py - gajim/gtk/groupchat_roster.py - pyrightconfig.json Changes: ===================================== gajim/common/app.py ===================================== @@ -59,6 +59,7 @@ from gajim.gui.application import GajimApplication from gajim.common.storage.cache import CacheStorage from gajim.common.storage.archive import MessageArchiveStorage + from gajim.common.storage.events import EventStorage from gajim.common.cert_store import CertificateStore from gajim.common.call_manager import CallManager from gajim.common.preview import PreviewManager @@ -88,6 +89,7 @@ class Storage: def __init__(self): self.cache: CacheStorage = None self.archive: MessageArchiveStorage = None + self.events: EventStorage = None storage = Storage() ===================================== gajim/common/application.py ===================================== @@ -44,6 +44,7 @@ from gajim.common.events import GajimUpdateAvailable from gajim.common.client import Client from gajim.common.helpers import make_http_request +from gajim.common.storage.events import EventStorage from gajim.common.task_manager import TaskManager from gajim.common.settings import Settings from gajim.common.settings import LegacyConfig @@ -74,6 +75,9 @@ def _init_core(self) -> None: app.storage.cache = CacheStorage() app.storage.cache.init() + app.storage.events = EventStorage() + app.storage.events.init() + app.storage.archive = MessageArchiveStorage() app.storage.archive.init() ===================================== gajim/common/events.py ===================================== @@ -32,7 +32,10 @@ from nbxmpp.structs import LocationData from nbxmpp.structs import RosterItem from nbxmpp.structs import TuneData +from nbxmpp.const import Affiliation from nbxmpp.const import InviteType +from nbxmpp.const import Role +from nbxmpp.const import StatusCode from gajim.common.file_props import FileProp from gajim.common.const import JingleState @@ -676,3 +679,101 @@ class AllowGajimUpdateCheck(ApplicationEvent): class GajimUpdateAvailable(ApplicationEvent): name: str = field(init=False, default='gajim-update-available') version: str + + +@dataclass +class MUCNicknameChanged(ApplicationEvent): + name: str = field(init=False, default='muc-nickname-changed') + is_self: bool + new_name: str + old_name: str + timestamp: float + + +@dataclass +class MUCRoomConfigChanged(ApplicationEvent): + name: str = field(init=False, default='muc-room-config-changed') + timestamp: float + status_codes: set[StatusCode] + + +@dataclass +class MUCRoomConfigFinished(ApplicationEvent): + name: str = field(init=False, default='muc-room-config-finished') + timestamp: float + + +@dataclass +class MUCRoomPresenceError(ApplicationEvent): + name: str = field(init=False, default='muc-room-presence-error') + timestamp: float + error: Any + + +@dataclass +class MUCRoomKicked(ApplicationEvent): + name: str = field(init=False, default='muc-room-kicked') + timestamp: float + status_codes: Optional[set[StatusCode]] + reason: Optional[str] + actor: Optional[str] + + +@dataclass +class MUCRoomDestroyed(ApplicationEvent): + name: str = field(init=False, default='muc-room-destroyed') + timestamp: float + reason: Optional[str] + alternate: Optional[JID] + + +@dataclass +class MUCUserJoined(ApplicationEvent): + name: str = field(init=False, default='muc-user-joined') + timestamp: float + is_self: bool + nick: str + status_codes: Optional[set[StatusCode]] + + +@dataclass +class MUCUserLeft(ApplicationEvent): + name: str = field(init=False, default='muc-user-left') + timestamp: float + is_self: bool + nick: str + status_codes: Optional[set[StatusCode]] + reason: Optional[str] + actor: Optional[str] + + +@dataclass +class MUCUserRoleChanged(ApplicationEvent): + name: str = field(init=False, default='muc-user-role-changed') + timestamp: float + is_self: bool + nick: str + role: Role + reason: Optional[str] + actor: Optional[str] + + +@dataclass +class MUCUserAffiliationChanged(ApplicationEvent): + name: str = field(init=False, default='muc-user-affiliation-changed') + timestamp: float + is_self: bool + nick: str + affiliation: Affiliation + reason: Optional[str] + actor: Optional[str] + + +@dataclass +class MUCUserStatusShowChanged(ApplicationEvent): + name: str = field(init=False, default='muc-user-status-show-changed') + timestamp: float + is_self: bool + nick: str + status: str + show_value: str ===================================== gajim/common/modules/muc.py ===================================== @@ -45,6 +45,7 @@ from gi.repository import GLib from gajim.common import app +from gajim.common import events from gajim.common import helpers from gajim.common import types from gajim.common.const import ClientState, KindConstant @@ -460,7 +461,11 @@ def _on_disco_result_after_config(self, task: Task) -> None: self._log.info('Configuration finished: %s', jid) room = self._get_contact(jid.bare) - room.notify('room-config-finished') + event = events.MUCRoomConfigFinished(timestamp=time.time()) + + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + room.notify('room-config-finished', event) def update_presence(self) -> None: mucs = self._get_mucs_with_state([MUCJoinedState.JOINED, @@ -540,6 +545,11 @@ def _on_error_presence(self, self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) else: + event = events.MUCRoomPresenceError( + timestamp=time.time(), + error=properties.error) + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) room.notify('room-presence-error', properties) def _on_muc_user_presence(self, @@ -564,7 +574,15 @@ def _on_muc_user_presence(self, self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._con.get_module('Bookmarks').remove(room_jid) room.set_not_joined() - room.notify('room-destroyed', properties) + + event = events.MUCRoomDestroyed( + timestamp=time.time(), + reason=properties.muc_destroyed.reason, + alternate=properties.muc_destroyed.alternate) + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + + room.notify('room-destroyed', event) return if properties.is_nickname_changed: @@ -592,10 +610,16 @@ def _on_muc_user_presence(self, presence, occupant) - room.notify('user-nickname-changed', - occupant, - new_occupant, - properties) + event = events.MUCNicknameChanged( + timestamp=time.time(), + is_self=properties.is_muc_self_presence, + new_name=new_occupant.name, + old_name=occupant.name) + + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + + room.notify('user-nickname-changed', event, occupant, new_occupant) return is_joined = self._is_user_joined(properties.jid) @@ -624,7 +648,16 @@ def _on_muc_user_presence(self, if properties.is_muc_self_presence and properties.is_kicked: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() - room.notify('room-kicked', properties) + + event = events.MUCRoomKicked( + timestamp=time.time(), + status_codes=properties.muc_status_codes, + reason=properties.muc_user.reason, + actor=properties.muc_user.actor) + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + room.notify('room-kicked', event) + status_codes = properties.muc_status_codes or [] if StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: self._start_rejoin_timeout(room_jid) @@ -652,30 +685,84 @@ def _process_occupant_presence_change( presence: MUCPresenceData, occupant: GroupchatParticipant) -> None: + timestamp = time.time() + if not occupant.is_available and presence.available: + + event = events.MUCUserJoined( + timestamp=timestamp, + is_self=properties.is_muc_self_presence, + nick=occupant.name, + status_codes=properties.muc_status_codes) + + if occupant.room.is_joined or properties.is_muc_self_presence: + # Don’t store initial presences on join + app.storage.events.store(occupant.room, event) + occupant.update_presence(presence) - occupant.notify('user-joined', properties) + occupant.notify('user-joined', event) return if not presence.available: + + event = events.MUCUserLeft( + timestamp=timestamp, + is_self=properties.is_muc_self_presence, + nick=occupant.name, + status_codes=properties.muc_status_codes, + reason=properties.muc_user.reason, + actor=properties.muc_user.actor) + + app.storage.events.store(occupant.room, event) occupant.update_presence(presence) - occupant.notify('user-left', properties) + occupant.notify('user-left', event) return - signals: list[str] = [] + signals_and_events: list[tuple[str, Any]] = [] + if occupant.affiliation != presence.affiliation: - signals.append('user-affiliation-changed') + + event = events.MUCUserAffiliationChanged( + timestamp=timestamp, + is_self=properties.is_muc_self_presence, + nick=occupant.name, + affiliation=presence.affiliation, + reason=properties.muc_user.reason, + actor=properties.muc_user.actor) + + app.storage.events.store(occupant.room, event) + signals_and_events.append(('user-affiliation-changed', event)) if occupant.role != presence.role: - signals.append('user-role-changed') + + event = events.MUCUserRoleChanged( + timestamp=timestamp, + is_self=properties.is_muc_self_presence, + nick=occupant.name, + role=presence.role, + reason=properties.muc_user.reason, + actor=properties.muc_user.actor) + + app.storage.events.store(occupant.room, event) + signals_and_events.append(('user-role-changed', event)) if (occupant.status != presence.status or occupant.show != presence.show): - signals.append('user-status-show-changed') + + event = events.MUCUserStatusShowChanged( + timestamp=timestamp, + is_self=properties.is_muc_self_presence, + nick=occupant.name, + status=properties.status, + show_value=properties.show.value) + + app.storage.events.store(occupant, event) + app.storage.events.store(occupant.room, event) + signals_and_events.append(('user-status-show-changed', event)) occupant.update_presence(presence) - for signal in signals: - occupant.notify(signal, properties) + for signal, event in signals_and_events: + occupant.notify(signal, event) def _process_user_presence(self, properties: PresenceProperties @@ -953,12 +1040,21 @@ def _on_config_change(self, if not properties.is_muc_config_change: return - room_jid = str(properties.muc_jid) self._log.info('Received config change: %s %s', - room_jid, properties.muc_status_codes) + properties.muc_jid, properties.muc_status_codes) - room = self._get_contact(room_jid) - room.notify('room-config-changed', properties) + assert properties.muc_status_codes is not None + event = events.MUCRoomConfigChanged( + timestamp=time.time(), + status_codes=properties.muc_status_codes) + + assert properties.muc_jid is not None + room = self._get_contact(properties.muc_jid) + + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + + room.notify('room-config-changed', event) raise nbxmpp.NodeProcessed ===================================== gajim/common/storage/base.py ===================================== @@ -30,11 +30,15 @@ from gi.repository import GLib +import nbxmpp.const from nbxmpp.protocol import Iq from nbxmpp.protocol import JID from nbxmpp.structs import RosterItem from nbxmpp.structs import DiscoInfo from nbxmpp.structs import CommonError +from nbxmpp.const import Role +from nbxmpp.const import Affiliation +from nbxmpp.const import StatusCode from nbxmpp.modules.discovery import parse_disco_info @@ -98,6 +102,13 @@ def _adapt_disco_info(disco_info: DiscoInfo) -> str: sqlite3.register_adapter(DiscoInfo, _adapt_disco_info) +def _convert_json(json_string: bytes) -> dict[str, Any]: + return json.loads(json_string, object_hook=json_decoder) + + +sqlite3.register_converter('JSON', _convert_json) + + class Encoder(json.JSONEncoder): def default(self, o: Any) -> Any: if isinstance(o, set): @@ -111,6 +122,10 @@ def default(self, o: Any) -> Any: dct['__type'] = 'RosterItem' return dct + if isinstance(o, (Affiliation, Role, StatusCode)): + return {'value': o.value, + '__type': o.__class__.__name__} + return json.JSONEncoder.default(self, o) @@ -118,8 +133,10 @@ def json_decoder(dct: dict[str, Any]) -> Any: type_ = dct.get('__type') if type_ is None: return dct + if type_ == 'JID': return JID.from_string(dct['value']) + if type_ == 'RosterItem': return RosterItem(jid=dct['jid'], name=dct['name'], @@ -127,6 +144,10 @@ def json_decoder(dct: dict[str, Any]) -> Any: subscription=dct['subscription'], approved=dct['approved'], groups=set(dct['groups'])) + + if type_ in ('Affiliation', 'Role', 'StatusCode'): + return getattr(nbxmpp.const, type_)(dct['value']) + return dct ===================================== gajim/common/storage/events.py ===================================== @@ -0,0 +1,133 @@ +# 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 +import dataclasses + +from typing import Any +from typing import Iterator +from typing import NamedTuple + +import json +import sqlite3 +import logging +from collections import namedtuple + +from nbxmpp.protocol import JID + +from gajim.common import events +from gajim.common.storage.base import SqliteStorage +from gajim.common.storage.base import Encoder +from gajim.common.types import ChatContactT + + +EVENTS_SQL_STATEMENT = ''' + CREATE TABLE events ( + account TEXT, + jid TEXT, + event TEXT, + timestamp REAL, + data TEXT); + + CREATE INDEX idx_account_jid ON events(account, jid); + + PRAGMA user_version=1; + ''' + +EVENT_CLASSES: dict[str, Any] = { + 'muc-nickname-changed': events.MUCNicknameChanged, + 'muc-room-config-changed': events.MUCRoomConfigChanged, + 'muc-room-config-finished': events.MUCRoomConfigFinished, + 'muc-room-presence-error': events.MUCRoomPresenceError, + 'muc-room-kicked': events.MUCRoomKicked, + 'muc-room-destroyed': events.MUCRoomDestroyed, + 'muc-user-joined': events.MUCUserJoined, + 'muc-user-left': events.MUCUserLeft, + 'muc-user-role-changed': events.MUCUserRoleChanged, + 'muc-user-affiliation-changed': events.MUCUserAffiliationChanged, + 'muc-user-status-show-changed': events.MUCUserStatusShowChanged, +} + +log = logging.getLogger('gajim.c.storage.events') + + +class EventRow(NamedTuple): + account: str + jid: JID + event: str + timestamp: float + data: dict[str, Any] + + +class EventStorage(SqliteStorage): + def __init__(self): + SqliteStorage.__init__(self, + log, + None, + EVENTS_SQL_STATEMENT) + + def init(self, **kwargs: Any) -> None: + SqliteStorage.init(self, + detect_types=sqlite3.PARSE_COLNAMES) + self._con.row_factory = self._namedtuple_factory + + @staticmethod + def _namedtuple_factory(cursor: sqlite3.Cursor, + row: tuple[Any, ...]) -> NamedTuple: + + assert cursor.description is not None + fields = [col[0] for col in cursor.description] + Row = namedtuple('Row', fields) # type: ignore + return Row(*row) + + def _migrate(self) -> None: + pass + + def store(self, + contact: ChatContactT, + event: Any + ) -> None: + + event_dict = dataclasses.asdict(event) + name = event_dict.pop('name') + timestamp = event_dict.pop('timestamp') + + insert_sql = ''' + INSERT INTO events(account, jid, event, timestamp, data) + VALUES(?, ?, ?, ?, ?)''' + + self._con.execute(insert_sql, (contact.account, + contact.jid, + name, + timestamp, + json.dumps(event_dict, cls=Encoder))) + + def load(self, + contact: ChatContactT, + before: bool, + timestamp: float + ) -> Iterator[EventRow]: + + time_operator = '<' if before else '>' + + insert_sql = ''' + SELECT account, jid, event, timestamp, data as "data [JSON]" + FROM events WHERE account=? AND jid=? AND timestamp %s ? + ''' % time_operator + + for row in self._con.execute(insert_sql, (contact.account, + contact.jid, + timestamp)).fetchall(): + event_class = EVENT_CLASSES[row.event] + yield event_class(**row.data, timestamp=row.timestamp) ===================================== gajim/gtk/chat_banner.py ===================================== @@ -21,8 +21,6 @@ import cairo -from nbxmpp.structs import PresenceProperties - from gajim.common import app from gajim.common import ged from gajim.common import types @@ -195,13 +193,7 @@ def _on_room_voice_request(self, *args: Any) -> None: self._voice_requests_button.set_no_show_all(False) self._voice_requests_button.show_all() - def _on_user_role_changed(self, - _contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - + def _on_user_role_changed(self, *args: Any) -> None: self._update_content() def _on_user_state_changed(self, *args: Any) -> None: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -28,7 +28,6 @@ from nbxmpp.errors import StanzaError from nbxmpp.protocol import JID from nbxmpp.structs import MessageProperties -from nbxmpp.structs import PresenceProperties from gajim.common import app from gajim.common import events @@ -297,23 +296,25 @@ def _on_user_joined(self, contact: GroupchatContact, _signal_name: str, _user_contact: GroupchatParticipant, - _properties: PresenceProperties + _event: events.MUCUserJoined ) -> None: + self._update_group_chat_actions(contact) def _on_user_role_changed(self, contact: GroupchatContact, _signal_name: str, _user_contact: GroupchatParticipant, - _properties: PresenceProperties + _event: events.MUCUserRoleChanged ) -> None: + self._update_group_chat_actions(contact) def _on_user_affiliation_changed(self, contact: GroupchatContact, _signal_name: str, _user_contact: GroupchatParticipant, - _properties: PresenceProperties + _event: events.MUCUserAffiliationChanged ) -> None: self._update_group_chat_actions(contact) ===================================== gajim/gtk/control.py ===================================== @@ -19,9 +19,6 @@ from typing import Union from typing import cast -from collections import defaultdict -from collections import deque -from functools import partial import os import logging import time @@ -31,9 +28,7 @@ from nbxmpp import JID from nbxmpp.const import StatusCode -from nbxmpp.structs import MessageProperties from nbxmpp.structs import MucSubject -from nbxmpp.structs import PresenceProperties from nbxmpp.modules.security_labels import Displaymarking from gajim.common import app @@ -100,12 +95,6 @@ def __init__(self) -> None: self._muc_subjects: dict[ types.ChatContactT, tuple[float, MucSubject]] = {} - # Store 100 info messages per contact on a FIFO basis - self._info_messages: dict[ - types.ChatContactT, - deque[tuple[float, str]]] = defaultdict( - partial(deque, maxlen=100)) # pyright: ignore - self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -177,7 +166,8 @@ def switch_contact(self, contact: Union[BareContact, if isinstance(contact, GroupchatParticipant): contact.multi_connect({ - 'user-status-show-changed': self._on_user_status_show_changed, + 'user-status-show-changed': + self._on_participant_status_show_changed, }) elif isinstance(contact, GroupchatContact): @@ -186,8 +176,7 @@ def switch_contact(self, contact: Union[BareContact, 'user-left': self._on_user_left, 'user-affiliation-changed': self._on_user_affiliation_changed, 'user-role-changed': self._on_user_role_changed, - 'user-status-show-changed': - self._on_muc_user_status_show_changed, + 'user-status-show-changed': self._on_user_status_show_changed, 'user-nickname-changed': self._on_user_nickname_changed, 'room-kicked': self._on_room_kicked, 'room-destroyed': self._on_room_destroyed, @@ -205,9 +194,6 @@ def switch_contact(self, contact: Union[BareContact, for transfer in transfers: self.add_file_transfer(transfer) - for timestamp, message in self._info_messages[contact]: - self.add_info_message(message, timestamp) - if isinstance(contact, GroupchatContact): if (app.settings.get('show_subject_on_join') or not contact.is_joining): @@ -501,10 +487,6 @@ def add_info_message(self, timestamp: Optional[float] = None ) -> None: - if timestamp is None: - assert self._contact is not None - self._info_messages[self._contact].append((time.time(), text)) - self.conversation_view.add_info_message(text, timestamp) def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: @@ -619,6 +601,43 @@ def _fetch_n_lines_history(self, # if self.conversation_view.reduce_message_count(before): # self._scrolled_view.set_history_complete(before, False) + assert self._contact is not None + for event in app.storage.events.load(self._contact, before, timestamp): + if isinstance(event, events.MUCUserJoined): + self._process_muc_user_joined(event) + + elif isinstance(event, events.MUCUserLeft): + self._process_muc_user_left(event) + + elif isinstance(event, events.MUCNicknameChanged): + self._process_muc_nickname_changed(event) + + elif isinstance(event, events.MUCRoomKicked): + self._process_muc_room_kicked(event) + + elif isinstance(event, events.MUCUserAffiliationChanged): + self._process_muc_user_affiliation_changed(event) + + elif isinstance(event, events.MUCUserRoleChanged): + self._process_muc_user_role_changed(event) + + elif isinstance(event, events.MUCUserStatusShowChanged): + self._process_muc_user_status_show_changed(event) + + elif isinstance(event, events.MUCRoomConfigChanged): + self._process_muc_room_config_changed(event) + + elif isinstance(event, events.MUCRoomConfigFinished): + self._process_muc_room_config_finished(event) + + elif isinstance(event, events.MUCRoomPresenceError): + self._process_muc_room_presence_error(event) + + elif isinstance(event, events.MUCRoomDestroyed): + self._process_muc_room_destroyed(event) + else: + raise ValueError('Unknown event: %s' % event) + self._scrolled_view.block_signals(False) def add_messages(self, messages: list[ConversationRow]): @@ -703,120 +722,228 @@ def add_message(self, additional_data=additional_data) def _on_user_nickname_changed(self, - contact: types.GroupchatContact, + _contact: types.GroupchatContact, _signal_name: str, - old_contact: types.GroupchatParticipant, - new_contact: types.GroupchatParticipant, - properties: PresenceProperties + event: events.MUCNicknameChanged, + _old_contact: types.GroupchatParticipant, + _new_contact: types.GroupchatParticipant ) -> None: - if properties.is_muc_self_presence: - message = _('You are now known as %s') % new_contact.name + self._process_muc_nickname_changed(event) + + def _process_muc_nickname_changed(self, + event: events.MUCNicknameChanged + ) -> None: + + if event.is_self: + message = _('You are now known as %s') % event.new_name else: message = _('{nick} is now known ' - 'as {new_nick}').format(nick=old_contact.name, - new_nick=new_contact.name) + 'as {new_nick}').format(nick=event.old_name, + new_nick=event.new_name) + self.add_info_message(message, event.timestamp) - self.add_info_message(message) + def _on_room_kicked(self, + _contact: GroupchatContact, + _signal_name: str, + event: events.MUCRoomKicked + ) -> None: - def _on_muc_user_status_show_changed(self, - contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: + self._process_muc_room_kicked(event) - if not contact.settings.get('print_status'): + def _process_muc_room_kicked(self, event: events.MUCRoomKicked) -> None: + status_codes = event.status_codes or [] + + reason = event.reason + reason = '' if reason is None else f': {reason}' + + actor = event.actor + # Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format( + actor=actor) + + # Group Chat: We have been removed from the room by Alice: reason + message = _('You have been removed from the ' + 'group chat{actor}{reason}') + + if StatusCode.REMOVED_ERROR in status_codes: + # Handle 333 before 307, some MUCs add both + # Group Chat: Server kicked us because of an server error + message = _('You have left due ' + 'to an error{reason}').format(reason=reason) + + elif StatusCode.REMOVED_KICKED in status_codes: + # Group Chat: We have been kicked by Alice: reason + message = _('You have been ' + 'kicked{actor}{reason}').format(actor=actor, + reason=reason) + + elif StatusCode.REMOVED_BANNED in status_codes: + # Group Chat: We have been banned by Alice: reason + message = _('You have been ' + 'banned{actor}{reason}').format(actor=actor, + reason=reason) + + elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: + # Group Chat: We were removed because of an affiliation change + reason = _(': Affiliation changed') + message = message.format(actor=actor, reason=reason) + + elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: + # Group Chat: Room configuration changed + reason = _(': Group chat configuration changed to members-only') + message = message.format(actor=actor, reason=reason) + + elif StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: + # Group Chat: Kicked because of server shutdown + reason = ': System shutdown' + message = message.format(actor=actor, reason=reason) + + else: + # No formatted message available return - self.conversation_view.add_user_status(user_contact.name, - user_contact.show.value, - user_contact.status) + self.add_info_message(message, event.timestamp) - def _on_user_status_show_changed(self, - _user_contact: GroupchatParticipant, + def _on_user_affiliation_changed(self, + _contact: GroupchatContact, _signal_name: str, - properties: PresenceProperties + user_contact: GroupchatParticipant, + event: events.MUCUserAffiliationChanged ) -> None: - nick = properties.muc_nickname - status = properties.status - status = '' if not status else f' - {status}' - assert properties.show is not None - show = helpers.get_uf_show(properties.show.value) + self._process_muc_user_affiliation_changed(event) - assert isinstance(self.contact, GroupchatParticipant) - if not self.contact.room.settings.get('print_status'): - return + def _process_muc_user_affiliation_changed( + self, + event: events.MUCUserAffiliationChanged) -> None: - if properties.is_muc_self_presence: - message = _('You are now {show}{status}').format(show=show, - status=status) + affiliation = helpers.get_uf_affiliation(event.affiliation) + + reason = event.reason + reason = '' if reason is None else f': {reason}' + + actor = event.actor + # Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format( + actor=actor) + if event.is_self: + message = _('** Your Affiliation has been set to ' + '{affiliation}{actor}{reason}').format( + affiliation=affiliation, + actor=actor, + reason=reason) else: - message = _('{nick} is now {show}{status}').format(nick=nick, - show=show, - status=status) - self.add_info_message(message) + message = _('** Affiliation of {nick} has been set to ' + '{affiliation}{actor}{reason}').format( + nick=event.nick, + affiliation=affiliation, + actor=actor, + reason=reason) - def add_muc_message(self, - text: str, - tim: float, - contact: str = '', - displaymarking: Optional[Displaymarking] = None, - message_id: Optional[str] = None, - stanza_id: Optional[str] = None, - additional_data: Optional[AdditionalDataDict] = None, - ) -> None: + self.add_info_message(message, event.timestamp) - assert isinstance(self._contact, GroupchatContact) + def _on_user_role_changed(self, + _contact: GroupchatContact, + _signal_name: str, + user_contact: GroupchatParticipant, + event: events.MUCUserRoleChanged + ) -> None: - if contact == self._contact.nickname: - kind = 'outgoing' + self._process_muc_user_role_changed(event) + + def _process_muc_user_role_changed(self, + event: events.MUCUserRoleChanged + ) -> None: + + role = helpers.get_uf_role(event.role) + nick = event.nick + + reason = event.reason + reason = '' if reason is None else f': {reason}' + + actor = event.actor + # Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format(actor=actor) + + if event.is_self: + message = _('** Your Role has been set to ' + '{role}{actor}{reason}').format(role=role, + actor=actor, + reason=reason) else: - kind = 'incoming' - # muc-specific chatstate + message = _('** Role of {nick} has been set to ' + '{role}{actor}{reason}').format(nick=nick, + role=role, + actor=actor, + reason=reason) + self.add_info_message(message, event.timestamp) - self._add_message(text, - kind, - contact, - tim, - displaymarking=displaymarking, - message_id=message_id, - stanza_id=stanza_id, - additional_data=additional_data) + def _on_user_status_show_changed(self, + contact: GroupchatContact, + _signal_name: str, + _user_contact: GroupchatParticipant, + event: events.MUCUserStatusShowChanged + ) -> None: - def _on_room_subject(self, - contact: GroupchatContact, - _signal_name: str, - subject: Optional[MucSubject] - ) -> None: + self._process_muc_user_status_show_changed(event) - if subject is None: - return + def _on_participant_status_show_changed( + self, + contact: GroupchatParticipant, + _signal_name: str, + event: events.MUCUserStatusShowChanged) -> None: - _timestamp, old_subject = self._muc_subjects.get(contact, (None, None)) - if old_subject is not None and old_subject.text == subject.text: - # Probably a rejoin, we already showed that subject + self._process_muc_user_status_show_changed(event) + + def _process_muc_user_status_show_changed( + self, + event: events.MUCUserStatusShowChanged) -> None: + + if isinstance(self._contact, GroupchatContact): + contact = self._contact + elif isinstance(self._contact, GroupchatParticipant): + contact = self._contact.room + else: + raise AssertionError + + if not contact.settings.get('print_status'): return - self._muc_subjects[contact] = (time.time(), subject) + nick = event.nick + status = event.status + status = '' if not status else f' - {status}' + show = helpers.get_uf_show(event.show_value) - if (app.settings.get('show_subject_on_join') or - not contact.is_joining): - self.conversation_view.add_muc_subject(subject) + if event.is_self: + message = _('You are now {show}{status}').format(show=show, + status=status) + + else: + message = _('{nick} is now {show}{status}').format( + nick=nick, + show=show, + status=status) + + self.add_info_message(message, event.timestamp) def _on_room_config_changed(self, _contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + event: events.MUCRoomConfigChanged ) -> None: - # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify - status_codes = properties.muc_status_codes - assert status_codes is not None + self._process_muc_room_config_changed(event) + + def _process_muc_room_config_changed(self, + event: events.MUCRoomConfigChanged + ) -> None: + # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify + status_codes = event.status_codes changes: list[str] = [] + if StatusCode.SHOWING_UNAVAILABLE in status_codes: changes.append(_('Group chat now shows unavailable members')) @@ -830,7 +957,8 @@ def _on_room_config_changed(self, self.client.get_module('Discovery').disco_muc(self.contact.jid) if StatusCode.CONFIG_ROOM_LOGGING in status_codes: - # Can be a presence (see chg_contact_status in groupchat_control.py) + # Can be a presence + # (see chg_contact_status in groupchat_control.py) changes.append(_('Conversations are stored on the server')) if StatusCode.CONFIG_NO_ROOM_LOGGING in status_codes: @@ -845,252 +973,202 @@ def _on_room_config_changed(self, if StatusCode.CONFIG_FULL_ANONYMOUS in status_codes: changes.append(_('Group chat is now fully anonymous')) - for change in changes: - self.add_info_message(change) - - def rejoin(self) -> None: - self.client.get_module('MUC').join(self.contact.jid) - - def _on_user_joined(self, - contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - - nick = user_contact.name - if not properties.is_muc_self_presence: - if contact.is_joined: - self.conversation_view.add_muc_user_joined(nick) - return - - status_codes = properties.muc_status_codes or [] - - if not contact.is_joined: - # We just joined the room - self.add_info_message(_('You (%s) joined the group chat') % nick) - - if StatusCode.NON_ANONYMOUS in status_codes: - self.add_info_message( - _('Any participant is allowed to see your full XMPP Address')) - - if StatusCode.CONFIG_ROOM_LOGGING in status_codes: - self.add_info_message(_('Conversations are stored on the server')) - - if StatusCode.NICKNAME_MODIFIED in status_codes: - self.add_info_message( - _('The server has assigned or modified your nickname in this ' - 'group chat')) + for message in changes: + self.add_info_message(message, event.timestamp) def _on_room_config_finished(self, _contact: GroupchatContact, - _signal_name: str + _signal_name: str, + event: events.MUCRoomConfigFinished ) -> None: + self._process_muc_room_config_finished(event) + + def _process_muc_room_config_finished(self, + event: events.MUCRoomConfigFinished + ) -> None: + self.add_info_message(_('A new group chat has been created')) - def _on_user_affiliation_changed(self, - _contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - affiliation = helpers.get_uf_affiliation(user_contact.affiliation) - nick = user_contact.name + def _on_room_presence_error(self, + _contact: GroupchatContact, + _signal_name: str, + event: events.MUCRoomPresenceError + ) -> None: - assert properties.muc_user is not None - reason = properties.muc_user.reason - reason = '' if reason is None else f': {reason}' + self._process_muc_room_presence_error(event) - actor = properties.muc_user.actor - # Group Chat: You have been kicked by Alice - actor = '' if actor is None else _(' by {actor}').format(actor=actor) + def _process_muc_room_presence_error(self, + event: events.MUCRoomPresenceError + ) -> None: - if properties.is_muc_self_presence: - message = _('** Your Affiliation has been set to ' - '{affiliation}{actor}{reason}').format( - affiliation=affiliation, - actor=actor, - reason=reason) - else: - message = _('** Affiliation of {nick} has been set to ' - '{affiliation}{actor}{reason}').format( - nick=nick, - affiliation=affiliation, - actor=actor, - reason=reason) + error_message = to_user_string(event.error) + self.add_info_message(_('Error: %s') % error_message) - self.add_info_message(message) + def _on_room_destroyed(self, + _contact: GroupchatContact, + _signal_name: str, + event: events.MUCRoomDestroyed + ) -> None: - def _on_user_role_changed(self, - _contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - role = helpers.get_uf_role(user_contact.role) - nick = user_contact.name + self._process_muc_room_destroyed(event) + + def _process_muc_room_destroyed(self, + event: events.MUCRoomDestroyed + ) -> None: - assert properties.muc_user is not None - reason = properties.muc_user.reason + reason = event.reason reason = '' if reason is None else f': {reason}' - actor = properties.muc_user.actor - # Group Chat: You have been kicked by Alice - actor = '' if actor is None else _(' by {actor}').format(actor=actor) + message = _('Group chat has been destroyed') - if properties.is_muc_self_presence: - message = _('** Your Role has been set to ' - '{role}{actor}{reason}').format(role=role, - actor=actor, - reason=reason) - else: - message = _('** Role of {nick} has been set to ' - '{role}{actor}{reason}').format(nick=nick, - role=role, - actor=actor, - reason=reason) + if event.alternate is not None: + message += '\n' + _('You can join this group chat instead: ' + 'xmpp:%s?join') % str(event.alternate) - self.add_info_message(message) + self.add_info_message(message, event.timestamp) - def _on_room_kicked(self, + def _on_user_joined(self, _contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + _user_contact: GroupchatParticipant, + event: events.MUCUserJoined ) -> None: - status_codes = properties.muc_status_codes or [] - assert properties.muc_user is not None - reason = properties.muc_user.reason - reason = '' if reason is None else f': {reason}' + self._process_muc_user_joined(event) - actor = properties.muc_user.actor - # Group Chat: You have been kicked by Alice - actor = '' if actor is None else _(' by {actor}').format(actor=actor) + def _process_muc_user_joined(self, event: events.MUCUserJoined) -> None: + assert isinstance(self.contact, GroupchatContact) - # Group Chat: We have been removed from the room by Alice: reason - message = _('You have been removed from the group chat{actor}{reason}') + if not event.is_self: + if self.contact.is_joined: + self.conversation_view.add_muc_user_joined(event) + return - if StatusCode.REMOVED_ERROR in status_codes: - # Handle 333 before 307, some MUCs add both - # Group Chat: Server kicked us because of an server error - message = _('You have left due ' - 'to an error{reason}').format(reason=reason) - self.add_info_message(message) + status_codes = event.status_codes or [] - elif StatusCode.REMOVED_KICKED in status_codes: - # Group Chat: We have been kicked by Alice: reason - message = _('You have been ' - 'kicked{actor}{reason}').format(actor=actor, - reason=reason) - self.add_info_message(message) + message = None + if not self.contact.is_joined: + # We just joined the room + message = _('You (%s) joined the group chat') % event.nick - elif StatusCode.REMOVED_BANNED in status_codes: - # Group Chat: We have been banned by Alice: reason - message = _('You have been ' - 'banned{actor}{reason}').format(actor=actor, - reason=reason) - self.add_info_message(message) + if StatusCode.NON_ANONYMOUS in status_codes: + message = _('Any participant is allowed to see your full ' + 'XMPP Address') - elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: - # Group Chat: We were removed because of an affiliation change - reason = _(': Affiliation changed') - message = message.format(actor=actor, reason=reason) - self.add_info_message(message) + if StatusCode.CONFIG_ROOM_LOGGING in status_codes: + message = _('Conversations are stored on the server') - elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: - # Group Chat: Room configuration changed - reason = _(': Group chat configuration changed to members-only') - message = message.format(actor=actor, reason=reason) - self.add_info_message(message) + if StatusCode.NICKNAME_MODIFIED in status_codes: + message = _('The server has assigned or modified your ' + 'nickname in this group chat') - elif StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: - # Group Chat: Kicked because of server shutdown - reason = ': System shutdown' - message = message.format(actor=actor, reason=reason) - self.add_info_message(message) + if message is not None: + self.add_info_message(message, event.timestamp) def _on_user_left(self, _contact: GroupchatContact, _signal_name: str, - user_contact: GroupchatParticipant, - properties: MessageProperties + _user_contact: GroupchatParticipant, + event: events.MUCUserLeft ) -> None: - status_codes = properties.muc_status_codes or [] - nick = user_contact.name - assert properties.muc_user is not None - reason = properties.muc_user.reason - reason = '' if reason is None else f': {reason}' + self._process_muc_user_left(event) - actor = properties.muc_user.actor - # Group Chat: You have been kicked by Alice - actor = '' if actor is None else _(' by {actor}').format(actor=actor) + def _process_muc_user_left(self, event: events.MUCUserLeft) -> None: + if event.is_self: + return - # Group Chat: We have been removed from the room - message = _('{nick} has been removed from the group chat{by}{reason}') + status_codes = event.status_codes or [] + nick = event.nick if StatusCode.REMOVED_ERROR in status_codes: # Handle 333 before 307, some MUCs add both - self.conversation_view.add_muc_user_left( - nick, properties.muc_user.reason, error=True) + self.conversation_view.add_muc_user_left(event, error=True) + return - elif StatusCode.REMOVED_KICKED in status_codes: - # Group Chat: User was kicked by Alice: reason + reason = event.reason + reason = '' if reason is None else f': {reason}' + + actor = event.actor + # Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format( + actor=actor) + + message = _('{nick} has been removed from the group ' + 'chat{by}{reason}') + + if StatusCode.REMOVED_KICKED in status_codes: message = _('{nick} has been ' 'kicked{actor}{reason}').format(nick=nick, actor=actor, reason=reason) - self.add_info_message(message) elif StatusCode.REMOVED_BANNED in status_codes: - # Group Chat: User was banned by Alice: reason message = _('{nick} has been ' 'banned{actor}{reason}').format(nick=nick, actor=actor, reason=reason) - self.add_info_message(message) elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: reason = _(': Affiliation changed') message = message.format(nick=nick, by=actor, reason=reason) - self.add_info_message(message) elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: reason = _(': Group chat configuration changed to members-only') message = message.format(nick=nick, by=actor, reason=reason) - self.add_info_message(message) else: - self.conversation_view.add_muc_user_left( - nick, properties.muc_user.reason) + self.conversation_view.add_muc_user_left(event) + return - def _on_room_presence_error(self, - _contact: GroupchatContact, - _signal_name: str, - properties: PresenceProperties - ) -> None: + self.add_info_message(message, event.timestamp) - assert properties.error is not None - error_message = to_user_string(properties.error) - self.add_info_message(_('Error: %s') % error_message) + def add_muc_message(self, + text: str, + tim: float, + contact: str = '', + displaymarking: Optional[Displaymarking] = None, + message_id: Optional[str] = None, + stanza_id: Optional[str] = None, + additional_data: Optional[AdditionalDataDict] = None, + ) -> None: - def _on_room_destroyed(self, - _contact: GroupchatContact, - _signal_name: str, - properties: PresenceProperties - ) -> None: + assert isinstance(self._contact, GroupchatContact) - destroyed = properties.muc_destroyed - assert destroyed is not None + if contact == self._contact.nickname: + kind = 'outgoing' + else: + kind = 'incoming' + # muc-specific chatstate - reason = destroyed.reason - reason = '' if reason is None else f': {reason}' + self._add_message(text, + kind, + contact, + tim, + displaymarking=displaymarking, + message_id=message_id, + stanza_id=stanza_id, + additional_data=additional_data) - message = _('Group chat has been destroyed') - self.add_info_message(message) + def _on_room_subject(self, + contact: GroupchatContact, + _signal_name: str, + subject: Optional[MucSubject] + ) -> None: - alternate = destroyed.alternate - if alternate is not None: - join_message = _('You can join this group chat ' - 'instead: xmpp:%s?join') % str(alternate) - self.add_info_message(join_message) + if subject is None: + return + + _timestamp, old_subject = self._muc_subjects.get(contact, (None, None)) + if old_subject is not None and old_subject.text == subject.text: + # Probably a rejoin, we already showed that subject + return + + self._muc_subjects[contact] = (time.time(), subject) + + if (app.settings.get('show_subject_on_join') or + not contact.is_joining): + self.conversation_view.add_muc_subject(subject) + + def rejoin(self) -> None: + self.client.get_module('MUC').join(self.contact.jid) ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -27,13 +27,19 @@ class MUCJoinLeft(BaseRow): - def __init__(self, type_: str, account: str, nick: str, + def __init__(self, + type_: str, + account: str, + nick: str, reason: Optional[str] = None, - error: bool = False): + error: bool = False, + timestamp: Optional[float] = None + ) -> None: + BaseRow.__init__(self, account) self.type = type_ - timestamp = time.time() + timestamp = timestamp or time.time() self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp ===================================== gajim/gtk/conversation/view.py ===================================== @@ -37,9 +37,7 @@ from gajim.common import app from gajim.common import types -from gajim.common.events import JingleRequestReceived -from gajim.common.events import FileRequestReceivedEvent -from gajim.common.events import FileRequestSent +from gajim.common import events from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day @@ -175,26 +173,29 @@ def add_muc_subject(self, self._insert_message(muc_subject) def add_muc_user_left(self, - nick: str, - reason: str, - error: bool = False) -> None: + event: events.MUCUserLeft, + error: bool = False + ) -> None: + assert isinstance(self._contact, GroupchatContact) if not self._contact.settings.get('print_join_left'): return join_left = MUCJoinLeft('muc-user-left', self._contact.account, - nick, - reason=reason, - error=error) + event.nick, + reason=event.reason, + error=error, + timestamp=event.timestamp) self._insert_message(join_left) - def add_muc_user_joined(self, nick: str) -> None: + def add_muc_user_joined(self, event: events.MUCUserJoined) -> None: assert isinstance(self._contact, GroupchatContact) if not self._contact.settings.get('print_join_left'): return join_left = MUCJoinLeft('muc-user-joined', self._contact.account, - nick) + event.nick, + timestamp=event.timestamp) self._insert_message(join_left) def add_user_status(self, name: str, show: str, status: str) -> None: @@ -215,8 +216,8 @@ def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: def add_jingle_file_transfer(self, event: Union[ - FileRequestReceivedEvent, - FileRequestSent, + events.FileRequestReceivedEvent, + events.FileRequestSent, None] = None, db_message: Optional[ConversationRow] = None ) -> None: @@ -230,7 +231,7 @@ def add_jingle_file_transfer(self, self._insert_message(jingle_transfer_row) def add_call_message(self, - event: Optional[JingleRequestReceived] = None, + event: Optional[events.JingleRequestReceived] = None, db_message: Optional[ConversationRow] = None ) -> None: assert isinstance(self._contact, BareContact) ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -18,7 +18,6 @@ import logging -from nbxmpp.structs import PresenceProperties from gi.repository import Gtk from gi.repository import Gdk @@ -27,6 +26,7 @@ from gajim.common import ged from gajim.common import types from gajim.common.events import GcMessageReceived +from gajim.common.events import MUCNicknameChanged from gajim.common.ged import EventHelper from gajim.common.helpers import jid_is_blocked from gajim.common.helpers import message_needs_highlight @@ -76,12 +76,12 @@ def switch_contact(self, contact: types.GroupchatContactT) -> None: def _on_user_nickname_changed(self, _contact: types.GroupchatContact, _signal_name: str, + event: MUCNicknameChanged, old_contact: types.GroupchatParticipant, - new_contact: types.GroupchatParticipant, - properties: PresenceProperties + new_contact: types.GroupchatParticipant ) -> None: - if properties.is_muc_self_presence: + if event.is_self: return old_name = old_contact.name ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -25,7 +25,6 @@ from gi.repository import Gtk from gi.repository import GLib from nbxmpp.const import Affiliation -from nbxmpp.structs import PresenceProperties from gajim.common import app from gajim.common import ged @@ -36,6 +35,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr from gajim.common.events import ApplicationEvent +from gajim.common.events import MUCNicknameChanged from gajim.common.modules.contacts import GroupchatContact from .menus import get_groupchat_roster_menu @@ -281,11 +281,11 @@ def _update_contact(self, self._add_contact(user_contact) def _on_user_nickname_changed(self, - contact: types.GroupchatContact, + _contact: types.GroupchatContact, _signal_name: str, + _event: MUCNicknameChanged, old_contact: types.GroupchatParticipant, - new_contact: types.GroupchatParticipant, - properties: PresenceProperties + new_contact: types.GroupchatParticipant ) -> None: self._remove_contact(old_contact) ===================================== pyrightconfig.json ===================================== @@ -38,7 +38,7 @@ "gajim/common/regex.py", "gajim/common/setting_values.py", "gajim/common/sound.py", - "gajim/common/storage/", + "gajim/common/storage/*", "gajim/common/task_manager.py", "gajim/gajim.py", "gajim/gajim_remote.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91cb768eb2173ce27492571fdf721255… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91cb768eb2173ce27492571fdf721255… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch archive_cache
by Philipp Hörist (＠lovetox) 04 Sep '22

04 Sep '22

Philipp Hörist deleted branch archive_cache at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][archive_cache] 2 commits: cfix: fix more stuff
by Philipp Hörist (＠lovetox) 04 Sep '22

04 Sep '22

Philipp Hörist pushed to branch archive_cache at gajim / gajim Commits: e3ad70b9 by lovetox at 2022-09-04T13:37:46+02:00 cfix: fix more stuff - - - - - 88b53048 by lovetox at 2022-09-04T18:02:25+02:00 cfix: more stuff - - - - - 6 changed files: - gajim/common/modules/muc.py - gajim/common/storage/events.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/view.py - pyrightconfig.json Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -692,11 +692,14 @@ def _process_occupant_presence_change( event = events.MUCUserJoined( timestamp=timestamp, is_self=properties.is_muc_self_presence, - nick=self.name, + nick=occupant.name, status_codes=properties.muc_status_codes) + if occupant.room.is_joined or properties.is_muc_self_presence: + # Don’t store initial presences on join + app.storage.events.store(occupant.room, event) + occupant.update_presence(presence) - app.storage.events.store(self.room, event) occupant.notify('user-joined', event) return @@ -705,13 +708,13 @@ def _process_occupant_presence_change( event = events.MUCUserLeft( timestamp=timestamp, is_self=properties.is_muc_self_presence, - nick=self.name, + nick=occupant.name, status_codes=properties.muc_status_codes, reason=properties.muc_user.reason, actor=properties.muc_user.actor) + app.storage.events.store(occupant.room, event) occupant.update_presence(presence) - app.storage.events.store(self.room, event) occupant.notify('user-left', event) return @@ -722,11 +725,12 @@ def _process_occupant_presence_change( event = events.MUCUserAffiliationChanged( timestamp=timestamp, is_self=properties.is_muc_self_presence, - nick=self.name, - affiliation=self.affiliation, + nick=occupant.name, + affiliation=presence.affiliation, reason=properties.muc_user.reason, actor=properties.muc_user.actor) + app.storage.events.store(occupant.room, event) signals_and_events.append(('user-affiliation-changed', event)) if occupant.role != presence.role: @@ -734,11 +738,12 @@ def _process_occupant_presence_change( event = events.MUCUserRoleChanged( timestamp=timestamp, is_self=properties.is_muc_self_presence, - nick=self.name, - role=self.role, + nick=occupant.name, + role=presence.role, reason=properties.muc_user.reason, actor=properties.muc_user.actor) + app.storage.events.store(occupant.room, event) signals_and_events.append(('user-role-changed', event)) if (occupant.status != presence.status or @@ -747,15 +752,16 @@ def _process_occupant_presence_change( event = events.MUCUserStatusShowChanged( timestamp=timestamp, is_self=properties.is_muc_self_presence, - nick=self.name, + nick=occupant.name, status=properties.status, show_value=properties.show.value) + app.storage.events.store(occupant, event) + app.storage.events.store(occupant.room, event) signals_and_events.append(('user-status-show-changed', event)) occupant.update_presence(presence) for signal, event in signals_and_events: - app.storage.events.store(self.room, event) occupant.notify(signal, event) def _process_user_presence(self, ===================================== gajim/common/storage/events.py ===================================== @@ -16,6 +16,7 @@ import dataclasses from typing import Any +from typing import Iterator from typing import NamedTuple import json @@ -116,7 +117,7 @@ def load(self, contact: ChatContactT, before: bool, timestamp: float - ) -> list[EventRow]: + ) -> Iterator[EventRow]: time_operator = '<' if before else '>' ===================================== gajim/gtk/control.py ===================================== @@ -29,7 +29,6 @@ from nbxmpp import JID from nbxmpp.const import StatusCode from nbxmpp.structs import MucSubject -from nbxmpp.structs import PresenceProperties from nbxmpp.modules.security_labels import Displaymarking from gajim.common import app @@ -167,7 +166,8 @@ def switch_contact(self, contact: Union[BareContact, if isinstance(contact, GroupchatParticipant): contact.multi_connect({ - 'user-status-show-changed': self._on_user_status_show_changed, + 'user-status-show-changed': + self._on_participant_status_show_changed, }) elif isinstance(contact, GroupchatContact): @@ -176,8 +176,7 @@ def switch_contact(self, contact: Union[BareContact, 'user-left': self._on_user_left, 'user-affiliation-changed': self._on_user_affiliation_changed, 'user-role-changed': self._on_user_role_changed, - 'user-status-show-changed': - self._on_muc_user_status_show_changed, + 'user-status-show-changed': self._on_user_status_show_changed, 'user-nickname-changed': self._on_user_nickname_changed, 'room-kicked': self._on_room_kicked, 'room-destroyed': self._on_room_destroyed, @@ -602,6 +601,7 @@ def _fetch_n_lines_history(self, # if self.conversation_view.reduce_message_count(before): # self._scrolled_view.set_history_complete(before, False) + assert self._contact is not None for event in app.storage.events.load(self._contact, before, timestamp): if isinstance(event, events.MUCUserJoined): self._process_muc_user_joined(event) @@ -881,26 +881,41 @@ def _process_muc_user_role_changed(self, self.add_info_message(message, event.timestamp) def _on_user_status_show_changed(self, - _user_contact: GroupchatParticipant, + contact: GroupchatContact, _signal_name: str, + _user_contact: GroupchatParticipant, event: events.MUCUserStatusShowChanged ) -> None: self._process_muc_user_status_show_changed(event) + def _on_participant_status_show_changed( + self, + contact: GroupchatParticipant, + _signal_name: str, + event: events.MUCUserStatusShowChanged) -> None: + + self._process_muc_user_status_show_changed(event) + def _process_muc_user_status_show_changed( self, event: events.MUCUserStatusShowChanged) -> None: + if isinstance(self._contact, GroupchatContact): + contact = self._contact + elif isinstance(self._contact, GroupchatParticipant): + contact = self._contact.room + else: + raise AssertionError + + if not contact.settings.get('print_status'): + return + nick = event.nick status = event.status status = '' if not status else f' - {status}' show = helpers.get_uf_show(event.show_value) - assert isinstance(self.contact, GroupchatParticipant) - if not self.contact.room.settings.get('print_status'): - return - if event.is_self: message = _('You are now {show}{status}').format(show=show, status=status) @@ -1026,7 +1041,7 @@ def _process_muc_user_joined(self, event: events.MUCUserJoined) -> None: if not event.is_self: if self.contact.is_joined: - self.conversation_view.add_muc_user_joined(event.nick) + self.conversation_view.add_muc_user_joined(event) return status_codes = event.status_codes or [] @@ -1066,6 +1081,11 @@ def _process_muc_user_left(self, event: events.MUCUserLeft) -> None: status_codes = event.status_codes or [] nick = event.nick + if StatusCode.REMOVED_ERROR in status_codes: + # Handle 333 before 307, some MUCs add both + self.conversation_view.add_muc_user_left(event, error=True) + return + reason = event.reason reason = '' if reason is None else f': {reason}' @@ -1074,24 +1094,16 @@ def _process_muc_user_left(self, event: events.MUCUserLeft) -> None: actor = '' if actor is None else _(' by {actor}').format( actor=actor) - # Group Chat: We have been removed from the room message = _('{nick} has been removed from the group ' 'chat{by}{reason}') - if StatusCode.REMOVED_ERROR in status_codes: - # Handle 333 before 307, some MUCs add both - self.conversation_view.add_muc_user_left( - nick, event.reason, error=True) - - elif StatusCode.REMOVED_KICKED in status_codes: - # Group Chat: User was kicked by Alice: reason + if StatusCode.REMOVED_KICKED in status_codes: message = _('{nick} has been ' 'kicked{actor}{reason}').format(nick=nick, actor=actor, reason=reason) elif StatusCode.REMOVED_BANNED in status_codes: - # Group Chat: User was banned by Alice: reason message = _('{nick} has been ' 'banned{actor}{reason}').format(nick=nick, actor=actor, @@ -1106,25 +1118,11 @@ def _process_muc_user_left(self, event: events.MUCUserLeft) -> None: message = message.format(nick=nick, by=actor, reason=reason) else: - self.conversation_view.add_muc_user_left(nick, event.reason) + self.conversation_view.add_muc_user_left(event) return self.add_info_message(message, event.timestamp) - def _on_muc_user_status_show_changed(self, - contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - - if not contact.settings.get('print_status'): - return - - self.conversation_view.add_user_status(user_contact.name, - user_contact.show.value, - user_contact.status) - def add_muc_message(self, text: str, tim: float, ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -27,13 +27,19 @@ class MUCJoinLeft(BaseRow): - def __init__(self, type_: str, account: str, nick: str, + def __init__(self, + type_: str, + account: str, + nick: str, reason: Optional[str] = None, - error: bool = False): + error: bool = False, + timestamp: Optional[float] = None + ) -> None: + BaseRow.__init__(self, account) self.type = type_ - timestamp = time.time() + timestamp = timestamp or time.time() self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp ===================================== gajim/gtk/conversation/view.py ===================================== @@ -37,9 +37,7 @@ from gajim.common import app from gajim.common import types -from gajim.common.events import JingleRequestReceived -from gajim.common.events import FileRequestReceivedEvent -from gajim.common.events import FileRequestSent +from gajim.common import events from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day @@ -175,26 +173,29 @@ def add_muc_subject(self, self._insert_message(muc_subject) def add_muc_user_left(self, - nick: str, - reason: Optional[str], - error: bool = False) -> None: + event: events.MUCUserLeft, + error: bool = False + ) -> None: + assert isinstance(self._contact, GroupchatContact) if not self._contact.settings.get('print_join_left'): return join_left = MUCJoinLeft('muc-user-left', self._contact.account, - nick, - reason=reason, - error=error) + event.nick, + reason=event.reason, + error=error, + timestamp=event.timestamp) self._insert_message(join_left) - def add_muc_user_joined(self, nick: str) -> None: + def add_muc_user_joined(self, event: events.MUCUserJoined) -> None: assert isinstance(self._contact, GroupchatContact) if not self._contact.settings.get('print_join_left'): return join_left = MUCJoinLeft('muc-user-joined', self._contact.account, - nick) + event.nick, + timestamp=event.timestamp) self._insert_message(join_left) def add_user_status(self, name: str, show: str, status: str) -> None: @@ -215,8 +216,8 @@ def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: def add_jingle_file_transfer(self, event: Union[ - FileRequestReceivedEvent, - FileRequestSent, + events.FileRequestReceivedEvent, + events.FileRequestSent, None] = None, db_message: Optional[ConversationRow] = None ) -> None: @@ -230,7 +231,7 @@ def add_jingle_file_transfer(self, self._insert_message(jingle_transfer_row) def add_call_message(self, - event: Optional[JingleRequestReceived] = None, + event: Optional[events.JingleRequestReceived] = None, db_message: Optional[ConversationRow] = None ) -> None: assert isinstance(self._contact, BareContact) ===================================== pyrightconfig.json ===================================== @@ -38,7 +38,7 @@ "gajim/common/regex.py", "gajim/common/setting_values.py", "gajim/common/sound.py", - "gajim/common/storage/", + "gajim/common/storage/*", "gajim/common/task_manager.py", "gajim/gajim.py", "gajim/gajim_remote.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0a0b70cff2a45286e6737cc44839b22… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0a0b70cff2a45286e6737cc44839b22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][archive_cache] 2 commits: cfix: fix contacts
by Philipp Hörist (＠lovetox) 04 Sep '22

04 Sep '22

Philipp Hörist pushed to branch archive_cache at gajim / gajim Commits: 21eb4b05 by lovetox at 2022-09-04T12:43:11+02:00 cfix: fix contacts - - - - - 0a0b70cf by lovetox at 2022-09-04T12:59:21+02:00 cfix: fix some things - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -15,14 +15,11 @@ from __future__ import annotations from typing import Any -from typing import cast from typing import Iterator from typing import Optional from typing import Union from typing import overload -import time - import cairo from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate @@ -32,12 +29,9 @@ from nbxmpp.structs import DiscoInfo from nbxmpp.structs import LocationData from nbxmpp.structs import TuneData -from nbxmpp.structs import MessageProperties from nbxmpp.structs import MucSubject -from nbxmpp.structs import PresenceProperties from gajim.common import app -from gajim.common import events from gajim.common import types from gajim.common.const import PresenceShowExt from gajim.common.const import SimpleClientState ===================================== gajim/common/modules/muc.py ===================================== @@ -696,10 +696,12 @@ def _process_occupant_presence_change( status_codes=properties.muc_status_codes) occupant.update_presence(presence) - occupant.notify('user-joined', properties) + app.storage.events.store(self.room, event) + occupant.notify('user-joined', event) return if not presence.available: + event = events.MUCUserLeft( timestamp=timestamp, is_self=properties.is_muc_self_presence, @@ -709,12 +711,14 @@ def _process_occupant_presence_change( actor=properties.muc_user.actor) occupant.update_presence(presence) - occupant.notify('user-left', properties) + app.storage.events.store(self.room, event) + occupant.notify('user-left', event) return signals_and_events: list[tuple[str, Any]] = [] if occupant.affiliation != presence.affiliation: + event = events.MUCUserAffiliationChanged( timestamp=timestamp, is_self=properties.is_muc_self_presence, @@ -726,6 +730,7 @@ def _process_occupant_presence_change( signals_and_events.append(('user-affiliation-changed', event)) if occupant.role != presence.role: + event = events.MUCUserRoleChanged( timestamp=timestamp, is_self=properties.is_muc_self_presence, @@ -751,7 +756,7 @@ def _process_occupant_presence_change( occupant.update_presence(presence) for signal, event in signals_and_events: app.storage.events.store(self.room, event) - occupant.notify(signal, properties) + occupant.notify(signal, event) def _process_user_presence(self, properties: PresenceProperties View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b020fd3cdeb01ab8c42e1445b78a0ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b020fd3cdeb01ab8c42e1445b78a0ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][archive_cache] 11 commits: change: ChatBanner: Add button for managing voice requests
by Philipp Hörist (＠lovetox) 04 Sep '22

04 Sep '22

Philipp Hörist pushed to branch archive_cache at gajim / gajim Commits: d78234b5 by wurstsalat at 2022-08-29T18:42:00+02:00 change: ChatBanner: Add button for managing voice requests - - - - - 8565a658 by André Apitzsch at 2022-08-29T22:12:16+02:00 chore: Flatpak: Update dependencies - - - - - 6cd28e28 by wurstsalat at 2022-08-31T20:06:27+02:00 cfix: DND: Fix moving chat list items to other workspaces - - - - - a8fd4a1f by wurstsalat at 2022-08-31T20:23:05+02:00 cfix: DND: Set source workspace for ChatListEntryParam - - - - - 857f654c by wurstsalat at 2022-08-31T22:47:20+02:00 cfix: ReadMarkers: Fix read-state-sync and sending markers Fixes #11114 - - - - - c74d8f0e by lovetox at 2022-09-02T22:23:58+02:00 fix: MUC: Improve automatically adding members on invite Gajims private definition of a group chat means also it must be non-anonymous. This make not much sense for the invite logic, here it should only matter if the room is members-only or not. - - - - - 6ae3bb31 by lovetox at 2022-09-03T10:01:28+00:00 refactor: Contacts: Remove convenience method - - - - - af02c6bd by lovetox at 2022-09-03T10:01:28+00:00 fix: Better validate message corrections - Refactor message processing code - Introduce 5 minute message correction limit - - - - - 78fd6fb0 by lovetox at 2022-09-04T11:00:38+02:00 change: Add requirement for min sqlite version - - - - - 5dbcf0b2 by lovetox at 2022-09-04T12:01:34+02:00 refactor: Contacts: Move presence change detection to MUC module - - - - - b020fd3c by lovetox at 2022-09-04T12:35:35+02:00 new: Add event storage - - - - - 30 changed files: - README.md - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/app.py - gajim/common/application.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/chat_markers.py - gajim/common/modules/contacts.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/util.py - gajim/common/storage/archive.py - gajim/common/storage/base.py - + gajim/common/storage/events.py - gajim/data/gui/chat_banner.ui - gajim/data/style/gajim.css - gajim/gajim.py - gajim/gtk/builder.pyi - gajim/gtk/chat_banner.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/control.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_nick_completion.py - gajim/gtk/groupchat_roster.py - + gajim/gtk/groupchat_voice_requests_button.py - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5de6f7ea075b2a728f42d0b2f779d15… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5de6f7ea075b2a728f42d0b2f779d15… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: change: Add requirement for min sqlite version
by Philipp Hörist (＠lovetox) 04 Sep '22

04 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 78fd6fb0 by lovetox at 2022-09-04T11:00:38+02:00 change: Add requirement for min sqlite version - - - - - 5dbcf0b2 by lovetox at 2022-09-04T12:01:34+02:00 refactor: Contacts: Move presence change detection to MUC module - - - - - 4 changed files: - README.md - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/gajim.py Changes: ===================================== README.md ===================================== @@ -19,6 +19,7 @@ ### Runtime Requirements - [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) - [Pango](https://gitlab.gnome.org/GNOME/pango) (>=1.50.0) - [libsoup](https://gitlab.gnome.org/GNOME/libsoup/) +- [sqlite](https://www.sqlite.org/) (>=3.33.0) ### Optional Runtime Requirements ===================================== gajim/common/modules/contacts.py ===================================== @@ -797,7 +797,7 @@ def is_not_joined(self) -> bool: def set_not_joined(self) -> None: for contact in self._resources.values(): - contact.update_presence(UNKNOWN_MUC_PRESENCE, notify=False) + contact.update_presence(UNKNOWN_MUC_PRESENCE) def get_user_nicknames(self) -> list[str]: client = app.get_client(self._account) @@ -922,39 +922,8 @@ def get_avatar(self, return app.app.avatar_storage.get_surface( self, size, scale, show, style=style) - def update_presence(self, - presence: MUCPresenceData, - *args: Any, - notify: bool = True - ) -> None: - if not notify: - self._presence = presence - return - - if not self._presence.available and presence.available: - self._presence = presence - self.notify('user-joined', *args) - return - - if not presence.available: - self._presence = presence - self.notify('user-left', *args) - return - - signals: list[str] = [] - if self._presence.affiliation != presence.affiliation: - signals.append('user-affiliation-changed') - - if self._presence.role != presence.role: - signals.append('user-role-changed') - - if (self._presence.status != presence.status or - self._presence.show != presence.show): - signals.append('user-status-show-changed') - + def update_presence(self, presence: MUCPresenceData) -> None: self._presence = presence - for signal in signals: - self.notify(signal, *args) def update_avatar(self, *args: Any) -> None: app.app.avatar_storage.invalidate_cache(self._jid) ===================================== gajim/common/modules/muc.py ===================================== @@ -61,6 +61,7 @@ from gajim.common.modules.bits_of_binary import store_bob_data from gajim.common.modules.base import BaseModule from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant log = logging.getLogger('gajim.c.m.muc') @@ -587,7 +588,9 @@ def _on_muc_user_presence(self, self._joined_users[room.jid][nickname] = occupant.presence presence = self._process_user_presence(properties) - occupant.update_presence(presence, properties) + self._process_occupant_presence_change(properties, + presence, + occupant) room.notify('user-nickname-changed', occupant, @@ -613,7 +616,9 @@ def _on_muc_user_presence(self, self._start_join_timeout(room_jid) presence = self._process_user_presence(properties) - occupant.update_presence(presence, properties) + self._process_occupant_presence_change(properties, + presence, + occupant) return if properties.is_muc_self_presence and properties.is_kicked: @@ -639,7 +644,38 @@ def _on_muc_user_presence(self, log.warning(stanza) return - occupant.update_presence(presence, properties) + self._process_occupant_presence_change(properties, presence, occupant) + + def _process_occupant_presence_change( + self, + properties: PresenceProperties, + presence: MUCPresenceData, + occupant: GroupchatParticipant) -> None: + + if not occupant.is_available and presence.available: + occupant.update_presence(presence) + occupant.notify('user-joined', properties) + return + + if not presence.available: + occupant.update_presence(presence) + occupant.notify('user-left', properties) + return + + signals: list[str] = [] + if occupant.affiliation != presence.affiliation: + signals.append('user-affiliation-changed') + + if occupant.role != presence.role: + signals.append('user-role-changed') + + if (occupant.status != presence.status or + occupant.show != presence.show): + signals.append('user-status-show-changed') + + occupant.update_presence(presence) + for signal in signals: + occupant.notify(signal, properties) def _process_user_presence(self, properties: PresenceProperties ===================================== gajim/gajim.py ===================================== @@ -21,6 +21,7 @@ import os import sys import signal +import sqlite3 import platform from ctypes import CDLL, byref, create_string_buffer from ctypes.util import find_library @@ -36,6 +37,7 @@ _MIN_PYGOBJECT_VER = '3.32.0' _MIN_GLIB_VER = '2.60.0' _MIN_PANGO_VER = '1.50.0' +_MIN_SQLITE_VER = '3.33.0' def check_version(dep_name: str, current_ver: str, min_ver: str) -> None: @@ -92,6 +94,7 @@ def _check_required_deps() -> None: check_version('gtk3', gtk_ver, _MIN_GTK_VER) check_version('glib', glib_ver, _MIN_GLIB_VER) check_version('pango', Pango.version_string(), _MIN_PANGO_VER) + check_version('sqlite', sqlite3.sqlite_version, _MIN_SQLITE_VER) def _init_gui(gui: str) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/af02c6bd53fad4e0065951597bd7ec8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/af02c6bd53fad4e0065951597bd7ec8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][archive_cache] 2 commits: imprv: Workspaces: Move chats when removing workspace
by Philipp Hörist (＠lovetox) 03 Sep '22

03 Sep '22

Philipp Hörist pushed to branch archive_cache at gajim / gajim Commits: 307b7baf by wurstsalat at 2022-08-29T11:59:48+02:00 imprv: Workspaces: Move chats when removing workspace Closes #11098 - - - - - 5de6f7ea by lovetox at 2022-08-31T21:46:40+02:00 new: Add event storage - - - - - 19 changed files: - gajim/common/app.py - gajim/common/application.py - gajim/common/events.py - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/common/storage/base.py - + gajim/common/storage/events.py - gajim/gtk/chat_banner.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/control.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_nick_completion.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/structs.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/common/app.py ===================================== @@ -59,6 +59,7 @@ from gajim.gui.application import GajimApplication from gajim.common.storage.cache import CacheStorage from gajim.common.storage.archive import MessageArchiveStorage + from gajim.common.storage.events import EventStorage from gajim.common.cert_store import CertificateStore from gajim.common.call_manager import CallManager from gajim.common.preview import PreviewManager @@ -88,6 +89,7 @@ class Storage: def __init__(self): self.cache: CacheStorage = None self.archive: MessageArchiveStorage = None + self.events: EventStorage = None storage = Storage() ===================================== gajim/common/application.py ===================================== @@ -44,6 +44,7 @@ from gajim.common.events import GajimUpdateAvailable from gajim.common.client import Client from gajim.common.helpers import make_http_request +from gajim.common.storage.events import EventStorage from gajim.common.task_manager import TaskManager from gajim.common.settings import Settings from gajim.common.settings import LegacyConfig @@ -74,6 +75,9 @@ def _init_core(self) -> None: app.storage.cache = CacheStorage() app.storage.cache.init() + app.storage.events = EventStorage() + app.storage.events.init() + app.storage.archive = MessageArchiveStorage() app.storage.archive.init() ===================================== gajim/common/events.py ===================================== @@ -32,7 +32,10 @@ from nbxmpp.structs import LocationData from nbxmpp.structs import RosterItem from nbxmpp.structs import TuneData +from nbxmpp.const import Affiliation from nbxmpp.const import InviteType +from nbxmpp.const import Role +from nbxmpp.const import StatusCode from gajim.common.file_props import FileProp from gajim.common.const import JingleState @@ -676,3 +679,101 @@ class AllowGajimUpdateCheck(ApplicationEvent): class GajimUpdateAvailable(ApplicationEvent): name: str = field(init=False, default='gajim-update-available') version: str + + +@dataclass +class MUCNicknameChanged(ApplicationEvent): + name: str = field(init=False, default='muc-nickname-changed') + is_self: bool + new_name: str + old_name: str + timestamp: float + + +@dataclass +class MUCRoomConfigChanged(ApplicationEvent): + name: str = field(init=False, default='muc-room-config-changed') + timestamp: float + status_codes: set[StatusCode] + + +@dataclass +class MUCRoomConfigFinished(ApplicationEvent): + name: str = field(init=False, default='muc-room-config-finished') + timestamp: float + + +@dataclass +class MUCRoomPresenceError(ApplicationEvent): + name: str = field(init=False, default='muc-room-presence-error') + timestamp: float + error: Any + + +@dataclass +class MUCRoomKicked(ApplicationEvent): + name: str = field(init=False, default='muc-room-kicked') + timestamp: float + status_codes: Optional[set[StatusCode]] + reason: Optional[str] + actor: Optional[str] + + +@dataclass +class MUCRoomDestroyed(ApplicationEvent): + name: str = field(init=False, default='muc-room-destroyed') + timestamp: float + reason: Optional[str] + alternate: Optional[JID] + + +@dataclass +class MUCUserJoined(ApplicationEvent): + name: str = field(init=False, default='muc-user-joined') + timestamp: float + is_self: bool + nick: str + status_codes: Optional[set[StatusCode]] + + +@dataclass +class MUCUserLeft(ApplicationEvent): + name: str = field(init=False, default='muc-user-left') + timestamp: float + is_self: bool + nick: str + status_codes: Optional[set[StatusCode]] + reason: Optional[str] + actor: Optional[str] + + +@dataclass +class MUCUserRoleChanged(ApplicationEvent): + name: str = field(init=False, default='muc-user-role-changed') + timestamp: float + is_self: bool + nick: str + role: Role + reason: Optional[str] + actor: Optional[str] + + +@dataclass +class MUCUserAffiliationChanged(ApplicationEvent): + name: str = field(init=False, default='muc-user-affiliation-changed') + timestamp: float + is_self: bool + nick: str + affiliation: Affiliation + reason: Optional[str] + actor: Optional[str] + + +@dataclass +class MUCUserStatusShowChanged(ApplicationEvent): + name: str = field(init=False, default='muc-user-status-show-changed') + timestamp: float + is_self: bool + nick: str + status: str + show_value: str ===================================== gajim/common/modules/contacts.py ===================================== @@ -15,11 +15,14 @@ from __future__ import annotations from typing import Any +from typing import cast from typing import Iterator from typing import Optional from typing import Union from typing import overload +import time + import cairo from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate @@ -29,9 +32,12 @@ from nbxmpp.structs import DiscoInfo from nbxmpp.structs import LocationData from nbxmpp.structs import TuneData +from nbxmpp.structs import MessageProperties from nbxmpp.structs import MucSubject +from nbxmpp.structs import PresenceProperties from gajim.common import app +from gajim.common import events from gajim.common import types from gajim.common.const import PresenceShowExt from gajim.common.const import SimpleClientState @@ -942,12 +948,32 @@ def update_presence(self, if not self._presence.available and presence.available: self._presence = presence - self.notify('user-joined', *args) + + properties = cast(MessageProperties, args[0]) + event = events.MUCUserJoined( + timestamp=time.time(), + is_self=properties.is_muc_self_presence, + nick=self.name, + status_codes=properties.muc_status_codes) + + app.storage.events.store(self.room, event) + self.notify('user-joined', event) return if not presence.available: self._presence = presence - self.notify('user-left', *args) + + properties = cast(MessageProperties, args[0]) + event = events.MUCUserLeft( + timestamp=time.time(), + is_self=properties.is_muc_self_presence, + nick=self.name, + status_codes=properties.muc_status_codes, + reason=properties.muc_user.reason, + actor=properties.muc_user.actor) + + app.storage.events.store(self.room, event) + self.notify('user-left', event) return signals: list[str] = [] @@ -962,8 +988,37 @@ def update_presence(self, signals.append('user-status-show-changed') self._presence = presence + for signal in signals: - self.notify(signal, *args) + properties = cast(PresenceProperties, args[0]) + if signal == 'user-affiliation-changed': + event = events.MUCUserAffiliationChanged( + timestamp=time.time(), + is_self=properties.is_muc_self_presence, + nick=self.name, + affiliation=self.affiliation, + reason=properties.muc_user.reason, + actor=properties.muc_user.actor) + + if signal == 'user-role-changed': + event = events.MUCUserRoleChanged( + timestamp=time.time(), + is_self=properties.is_muc_self_presence, + nick=self.name, + role=self.role, + reason=properties.muc_user.reason, + actor=properties.muc_user.actor) + + if signal == 'user-status-show-changed': + event = events.MUCUserStatusShowChanged( + timestamp=time.time(), + is_self=properties.is_muc_self_presence, + nick=self.name, + status=properties.status, + show_value=properties.show.value) + + app.storage.events.store(self.room, event) + self.notify(signal, event) def update_avatar(self, *args: Any) -> None: app.app.avatar_storage.invalidate_cache(self._jid) ===================================== gajim/common/modules/muc.py ===================================== @@ -44,6 +44,7 @@ from gi.repository import GLib from gajim.common import app +from gajim.common import events from gajim.common import helpers from gajim.common import types from gajim.common.const import ClientState, KindConstant @@ -456,7 +457,11 @@ def _on_disco_result_after_config(self, task: Task) -> None: self._log.info('Configuration finished: %s', jid) room = self._get_contact(jid.bare) - room.notify('room-config-finished') + event = events.MUCRoomConfigFinished(timestamp=time.time()) + + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + room.notify('room-config-finished', event) def update_presence(self) -> None: mucs = self._get_mucs_with_state([MUCJoinedState.JOINED, @@ -536,6 +541,11 @@ def _on_error_presence(self, self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) else: + event = events.MUCRoomPresenceError( + timestamp=time.time(), + error=properties.error) + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) room.notify('room-presence-error', properties) def _on_muc_user_presence(self, @@ -560,7 +570,15 @@ def _on_muc_user_presence(self, self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._con.get_module('Bookmarks').remove(room_jid) room.set_not_joined() - room.notify('room-destroyed', properties) + + event = events.MUCRoomDestroyed( + timestamp=time.time(), + reason=properties.muc_destroyed.reason, + alternate=properties.muc_destroyed.alternate) + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + + room.notify('room-destroyed', event) return if properties.is_nickname_changed: @@ -586,10 +604,16 @@ def _on_muc_user_presence(self, presence = self._process_user_presence(properties) occupant.update_presence(presence, properties) - room.notify('user-nickname-changed', - occupant, - new_occupant, - properties) + event = events.MUCNicknameChanged( + timestamp=time.time(), + is_self=properties.is_muc_self_presence, + new_name=new_occupant.name, + old_name=occupant.name) + + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + + room.notify('user-nickname-changed', event, occupant, new_occupant) return is_joined = self._is_user_joined(properties.jid) @@ -616,7 +640,16 @@ def _on_muc_user_presence(self, if properties.is_muc_self_presence and properties.is_kicked: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() - room.notify('room-kicked', properties) + + event = events.MUCRoomKicked( + timestamp=time.time(), + status_codes=properties.muc_status_codes, + reason=properties.muc_user.reason, + actor=properties.muc_user.actor) + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + room.notify('room-kicked', event) + status_codes = properties.muc_status_codes or [] if StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: self._start_rejoin_timeout(room_jid) @@ -889,12 +922,21 @@ def _on_config_change(self, if not properties.is_muc_config_change: return - room_jid = str(properties.muc_jid) self._log.info('Received config change: %s %s', - room_jid, properties.muc_status_codes) + properties.muc_jid, properties.muc_status_codes) - room = self._get_contact(room_jid) - room.notify('room-config-changed', properties) + assert properties.muc_status_codes is not None + event = events.MUCRoomConfigChanged( + timestamp=time.time(), + status_codes=properties.muc_status_codes) + + assert properties.muc_jid is not None + room = self._get_contact(properties.muc_jid) + + assert isinstance(room, GroupchatContact) + app.storage.events.store(room, event) + + room.notify('room-config-changed', event) raise nbxmpp.NodeProcessed ===================================== gajim/common/storage/base.py ===================================== @@ -30,11 +30,15 @@ from gi.repository import GLib +import nbxmpp.const from nbxmpp.protocol import Iq from nbxmpp.protocol import JID from nbxmpp.structs import RosterItem from nbxmpp.structs import DiscoInfo from nbxmpp.structs import CommonError +from nbxmpp.const import Role +from nbxmpp.const import Affiliation +from nbxmpp.const import StatusCode from nbxmpp.modules.discovery import parse_disco_info @@ -98,6 +102,13 @@ def _adapt_disco_info(disco_info: DiscoInfo) -> str: sqlite3.register_adapter(DiscoInfo, _adapt_disco_info) +def _convert_json(json_string: bytes) -> dict[str, Any]: + return json.loads(json_string, object_hook=json_decoder) + + +sqlite3.register_converter('JSON', _convert_json) + + class Encoder(json.JSONEncoder): def default(self, o: Any) -> Any: if isinstance(o, set): @@ -111,6 +122,10 @@ def default(self, o: Any) -> Any: dct['__type'] = 'RosterItem' return dct + if isinstance(o, (Affiliation, Role, StatusCode)): + return {'value': o.value, + '__type': o.__class__.__name__} + return json.JSONEncoder.default(self, o) @@ -118,8 +133,10 @@ def json_decoder(dct: dict[str, Any]) -> Any: type_ = dct.get('__type') if type_ is None: return dct + if type_ == 'JID': return JID.from_string(dct['value']) + if type_ == 'RosterItem': return RosterItem(jid=dct['jid'], name=dct['name'], @@ -127,6 +144,10 @@ def json_decoder(dct: dict[str, Any]) -> Any: subscription=dct['subscription'], approved=dct['approved'], groups=set(dct['groups'])) + + if type_ in ('Affiliation', 'Role', 'StatusCode'): + return getattr(nbxmpp.const, type_)(dct['value']) + return dct ===================================== gajim/common/storage/events.py ===================================== @@ -0,0 +1,132 @@ +# 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 +import dataclasses + +from typing import Any +from typing import NamedTuple + +import json +import sqlite3 +import logging +from collections import namedtuple + +from nbxmpp.protocol import JID + +from gajim.common import events +from gajim.common.storage.base import SqliteStorage +from gajim.common.storage.base import Encoder +from gajim.common.types import ChatContactT + + +EVENTS_SQL_STATEMENT = ''' + CREATE TABLE events ( + account TEXT, + jid TEXT, + event TEXT, + timestamp REAL, + data TEXT); + + CREATE INDEX idx_account_jid ON events(account, jid); + + PRAGMA user_version=1; + ''' + +EVENT_CLASSES: dict[str, Any] = { + 'muc-nickname-changed': events.MUCNicknameChanged, + 'muc-room-config-changed': events.MUCRoomConfigChanged, + 'muc-room-config-finished': events.MUCRoomConfigFinished, + 'muc-room-presence-error': events.MUCRoomPresenceError, + 'muc-room-kicked': events.MUCRoomKicked, + 'muc-room-destroyed': events.MUCRoomDestroyed, + 'muc-user-joined': events.MUCUserJoined, + 'muc-user-left': events.MUCUserLeft, + 'muc-user-role-changed': events.MUCUserRoleChanged, + 'muc-user-affiliation-changed': events.MUCUserAffiliationChanged, + 'muc-user-status-show-changed': events.MUCUserStatusShowChanged, +} + +log = logging.getLogger('gajim.c.storage.events') + + +class EventRow(NamedTuple): + account: str + jid: JID + event: str + timestamp: float + data: dict[str, Any] + + +class EventStorage(SqliteStorage): + def __init__(self): + SqliteStorage.__init__(self, + log, + None, + EVENTS_SQL_STATEMENT) + + def init(self, **kwargs: Any) -> None: + SqliteStorage.init(self, + detect_types=sqlite3.PARSE_COLNAMES) + self._con.row_factory = self._namedtuple_factory + + @staticmethod + def _namedtuple_factory(cursor: sqlite3.Cursor, + row: tuple[Any, ...]) -> NamedTuple: + + assert cursor.description is not None + fields = [col[0] for col in cursor.description] + Row = namedtuple('Row', fields) # type: ignore + return Row(*row) + + def _migrate(self) -> None: + pass + + def store(self, + contact: ChatContactT, + event: Any + ) -> None: + + event_dict = dataclasses.asdict(event) + name = event_dict.pop('name') + timestamp = event_dict.pop('timestamp') + + insert_sql = ''' + INSERT INTO events(account, jid, event, timestamp, data) + VALUES(?, ?, ?, ?, ?)''' + + self._con.execute(insert_sql, (contact.account, + contact.jid, + name, + timestamp, + json.dumps(event_dict, cls=Encoder))) + + def load(self, + contact: ChatContactT, + before: bool, + timestamp: float + ) -> list[EventRow]: + + time_operator = '<' if before else '>' + + insert_sql = ''' + SELECT account, jid, event, timestamp, data as "data [JSON]" + FROM events WHERE account=? AND jid=? AND timestamp %s ? + ''' % time_operator + + for row in self._con.execute(insert_sql, (contact.account, + contact.jid, + timestamp)).fetchall(): + event_class = EVENT_CLASSES[row.event] + yield event_class(**row.data, timestamp=row.timestamp) ===================================== gajim/gtk/chat_banner.py ===================================== @@ -21,8 +21,6 @@ import cairo -from nbxmpp.structs import PresenceProperties - from gajim.common import app from gajim.common import ged from gajim.common import types @@ -184,13 +182,7 @@ def _on_muc_state_changed(self, if contact.is_joined: self._update_content() - def _on_user_role_changed(self, - _contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - + def _on_user_role_changed(self, *args: Any) -> None: self._update_content() def _on_user_state_changed(self, *args: Any) -> None: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -243,16 +243,17 @@ def _move_chat_to_workspace(self, if not workspace_id: workspace_id = app.window.add_workspace(switch=False) - current_chatlist = cast(ChatList, self.get_visible_child()) - type_ = current_chatlist.get_chat_type(params.account, params.jid) + source_chatlist = self.get_chatlist(params.source_workspace_id) + type_ = source_chatlist.get_chat_type(params.account, params.jid) if type_ is None: return - current_chatlist.remove_chat(params.account, params.jid) + + source_chatlist.remove_chat(params.account, params.jid) new_chatlist = self.get_chatlist(workspace_id) new_chatlist.add_chat(params.account, params.jid, type_, False, -1) - self.store_open_chats(current_chatlist.workspace_id) + self.store_open_chats(source_chatlist.workspace_id) self.store_open_chats(workspace_id) @structs.actionmethod ===================================== gajim/gtk/chat_stack.py ===================================== @@ -28,7 +28,6 @@ from nbxmpp.errors import StanzaError from nbxmpp.protocol import JID from nbxmpp.structs import MessageProperties -from nbxmpp.structs import PresenceProperties from gajim.common import app from gajim.common import events @@ -297,23 +296,25 @@ def _on_user_joined(self, contact: GroupchatContact, _signal_name: str, _user_contact: GroupchatParticipant, - _properties: PresenceProperties + _event: events.MUCUserJoined ) -> None: + self._update_group_chat_actions(contact) def _on_user_role_changed(self, contact: GroupchatContact, _signal_name: str, _user_contact: GroupchatParticipant, - _properties: PresenceProperties + _event: events.MUCUserRoleChanged ) -> None: + self._update_group_chat_actions(contact) def _on_user_affiliation_changed(self, contact: GroupchatContact, _signal_name: str, _user_contact: GroupchatParticipant, - _properties: PresenceProperties + _event: events.MUCUserAffiliationChanged ) -> None: self._update_group_chat_actions(contact) ===================================== gajim/gtk/control.py ===================================== @@ -19,9 +19,6 @@ from typing import Union from typing import cast -from collections import defaultdict -from collections import deque -from functools import partial import os import logging import time @@ -105,12 +102,6 @@ def __init__(self) -> None: self._muc_subjects: dict[ types.ChatContactT, tuple[float, MucSubject]] = {} - # Store 100 info messages per contact on a FIFO basis - self._info_messages: dict[ - types.ChatContactT, - deque[tuple[float, str]]] = defaultdict( - partial(deque, maxlen=100)) # pyright: ignore - self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -212,9 +203,6 @@ def switch_contact(self, contact: Union[BareContact, for transfer in transfers: self.add_file_transfer(transfer) - for timestamp, message in self._info_messages[contact]: - self.add_info_message(message, timestamp) - if isinstance(contact, GroupchatContact): if (app.settings.get('show_subject_on_join') or not contact.is_joining): @@ -515,10 +503,6 @@ def add_info_message(self, timestamp: Optional[float] = None ) -> None: - if timestamp is None: - assert self._contact is not None - self._info_messages[self._contact].append((time.time(), text)) - self.conversation_view.add_info_message(text, timestamp) def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: @@ -639,6 +623,42 @@ def _fetch_n_lines_history(self, # if self.conversation_view.reduce_message_count(before): # self._scrolled_view.set_history_complete(before, False) + for event in app.storage.events.load(self._contact, before, timestamp): + if isinstance(event, events.MUCUserJoined): + self._process_muc_user_joined(event) + + elif isinstance(event, events.MUCUserLeft): + self._process_muc_user_left(event) + + elif isinstance(event, events.MUCNicknameChanged): + self._process_muc_nickname_changed(event) + + elif isinstance(event, events.MUCRoomKicked): + self._process_muc_room_kicked(event) + + elif isinstance(event, events.MUCUserAffiliationChanged): + self._process_muc_user_affiliation_changed(event) + + elif isinstance(event, events.MUCUserRoleChanged): + self._process_muc_user_role_changed(event) + + elif isinstance(event, events.MUCUserStatusShowChanged): + self._process_muc_user_status_show_changed(event) + + elif isinstance(event, events.MUCRoomConfigChanged): + self._process_muc_room_config_changed(event) + + elif isinstance(event, events.MUCRoomConfigFinished): + self._process_muc_room_config_finished(event) + + elif isinstance(event, events.MUCRoomPresenceError): + self._process_muc_room_presence_error(event) + + elif isinstance(event, events.MUCRoomDestroyed): + self._process_muc_room_destroyed(event) + else: + raise ValueError('Unknown event: %s' % event) + self._scrolled_view.block_signals(False) def add_messages(self, messages: list[ConversationRow]): @@ -723,143 +743,213 @@ def add_message(self, additional_data=additional_data) def _on_user_nickname_changed(self, - contact: types.GroupchatContact, + _contact: types.GroupchatContact, _signal_name: str, - old_contact: types.GroupchatParticipant, - new_contact: types.GroupchatParticipant, - properties: PresenceProperties + event: events.MUCNicknameChanged, + _old_contact: types.GroupchatParticipant, + _new_contact: types.GroupchatParticipant ) -> None: - if properties.is_muc_self_presence: - message = _('You are now known as %s') % new_contact.name + self._process_muc_nickname_changed(event) + + def _process_muc_nickname_changed(self, + event: events.MUCNicknameChanged + ) -> None: + + if event.is_self: + message = _('You are now known as %s') % event.new_name else: message = _('{nick} is now known ' - 'as {new_nick}').format(nick=old_contact.name, - new_nick=new_contact.name) + 'as {new_nick}').format(nick=event.old_name, + new_nick=event.new_name) + self.add_info_message(message, event.timestamp) - self.add_info_message(message) + def _on_room_kicked(self, + _contact: GroupchatContact, + _signal_name: str, + event: events.MUCRoomKicked + ) -> None: - def _on_muc_user_status_show_changed(self, - contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: + self._process_muc_room_kicked(event) - if not contact.settings.get('print_status'): + def _process_muc_room_kicked(self, event: events.MUCRoomKicked) -> None: + status_codes = event.status_codes or [] + + reason = event.reason + reason = '' if reason is None else f': {reason}' + + actor = event.actor + # Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format( + actor=actor) + + # Group Chat: We have been removed from the room by Alice: reason + message = _('You have been removed from the ' + 'group chat{actor}{reason}') + + if StatusCode.REMOVED_ERROR in status_codes: + # Handle 333 before 307, some MUCs add both + # Group Chat: Server kicked us because of an server error + message = _('You have left due ' + 'to an error{reason}').format(reason=reason) + + elif StatusCode.REMOVED_KICKED in status_codes: + # Group Chat: We have been kicked by Alice: reason + message = _('You have been ' + 'kicked{actor}{reason}').format(actor=actor, + reason=reason) + + elif StatusCode.REMOVED_BANNED in status_codes: + # Group Chat: We have been banned by Alice: reason + message = _('You have been ' + 'banned{actor}{reason}').format(actor=actor, + reason=reason) + + elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: + # Group Chat: We were removed because of an affiliation change + reason = _(': Affiliation changed') + message = message.format(actor=actor, reason=reason) + + elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: + # Group Chat: Room configuration changed + reason = _(': Group chat configuration changed to members-only') + message = message.format(actor=actor, reason=reason) + + elif StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: + # Group Chat: Kicked because of server shutdown + reason = ': System shutdown' + message = message.format(actor=actor, reason=reason) + + else: + # No formatted message available return - self.conversation_view.add_user_status(user_contact.name, - user_contact.show.value, - user_contact.status) + self.add_info_message(message, event.timestamp) - def _on_user_status_show_changed(self, - _user_contact: GroupchatParticipant, + def _on_user_affiliation_changed(self, + _contact: GroupchatContact, _signal_name: str, - properties: PresenceProperties + user_contact: GroupchatParticipant, + event: events.MUCUserAffiliationChanged ) -> None: - nick = properties.muc_nickname - status = properties.status - status = '' if not status else f' - {status}' - assert properties.show is not None - show = helpers.get_uf_show(properties.show.value) + self._process_muc_user_affiliation_changed(event) - assert isinstance(self.contact, GroupchatParticipant) - if not self.contact.room.settings.get('print_status'): - return + def _process_muc_user_affiliation_changed( + self, + event: events.MUCUserAffiliationChanged) -> None: - if properties.is_muc_self_presence: - message = _('You are now {show}{status}').format(show=show, - status=status) + affiliation = helpers.get_uf_affiliation(event.affiliation) + + reason = event.reason + reason = '' if reason is None else f': {reason}' + + actor = event.actor + # Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format( + actor=actor) + if event.is_self: + message = _('** Your Affiliation has been set to ' + '{affiliation}{actor}{reason}').format( + affiliation=affiliation, + actor=actor, + reason=reason) else: - message = _('{nick} is now {show}{status}').format(nick=nick, - show=show, - status=status) - self.add_info_message(message) + message = _('** Affiliation of {nick} has been set to ' + '{affiliation}{actor}{reason}').format( + nick=event.nick, + affiliation=affiliation, + actor=actor, + reason=reason) - def _on_room_voice_request(self, - _contact: GroupchatContact, - _signal_name: str, - properties: MessageProperties - ) -> None: - voice_request = properties.voice_request - assert voice_request is not None + self.add_info_message(message, event.timestamp) - def on_approve() -> None: - self.client.get_module('MUC').approve_voice_request( - self.contact.jid, voice_request) + def _on_user_role_changed(self, + _contact: GroupchatContact, + _signal_name: str, + user_contact: GroupchatParticipant, + event: events.MUCUserRoleChanged + ) -> None: - ConfirmationDialog( - _('Voice Request'), - _('Voice Request'), - _('%(nick)s from %(room_name)s requests voice') % { - 'nick': voice_request.nick, 'room_name': self.contact.name}, - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Approve'), - callback=on_approve)], - modal=False).show() + self._process_muc_user_role_changed(event) - def add_muc_message(self, - text: str, - tim: float, - contact: str = '', - displaymarking: Optional[Displaymarking] = None, - message_id: Optional[str] = None, - stanza_id: Optional[str] = None, - additional_data: Optional[AdditionalDataDict] = None, - ) -> None: + def _process_muc_user_role_changed(self, + event: events.MUCUserRoleChanged + ) -> None: - assert isinstance(self._contact, GroupchatContact) + role = helpers.get_uf_role(event.role) + nick = event.nick - if contact == self._contact.nickname: - kind = 'outgoing' + reason = event.reason + reason = '' if reason is None else f': {reason}' + + actor = event.actor + # Group Chat: You have been kicked by Alice + actor = '' if actor is None else _(' by {actor}').format(actor=actor) + + if event.is_self: + message = _('** Your Role has been set to ' + '{role}{actor}{reason}').format(role=role, + actor=actor, + reason=reason) else: - kind = 'incoming' - # muc-specific chatstate + message = _('** Role of {nick} has been set to ' + '{role}{actor}{reason}').format(nick=nick, + role=role, + actor=actor, + reason=reason) + self.add_info_message(message, event.timestamp) - self._add_message(text, - kind, - contact, - tim, - displaymarking=displaymarking, - message_id=message_id, - stanza_id=stanza_id, - additional_data=additional_data) + def _on_user_status_show_changed(self, + _user_contact: GroupchatParticipant, + _signal_name: str, + event: events.MUCUserStatusShowChanged + ) -> None: - def _on_room_subject(self, - contact: GroupchatContact, - _signal_name: str, - subject: Optional[MucSubject] - ) -> None: + self._process_muc_user_status_show_changed(event) - if subject is None: - return + def _process_muc_user_status_show_changed( + self, + event: events.MUCUserStatusShowChanged) -> None: - _timestamp, old_subject = self._muc_subjects.get(contact, (None, None)) - if old_subject is not None and old_subject.text == subject.text: - # Probably a rejoin, we already showed that subject + nick = event.nick + status = event.status + status = '' if not status else f' - {status}' + show = helpers.get_uf_show(event.show_value) + + assert isinstance(self.contact, GroupchatParticipant) + if not self.contact.room.settings.get('print_status'): return - self._muc_subjects[contact] = (time.time(), subject) + if event.is_self: + message = _('You are now {show}{status}').format(show=show, + status=status) - if (app.settings.get('show_subject_on_join') or - not contact.is_joining): - self.conversation_view.add_muc_subject(subject) + else: + message = _('{nick} is now {show}{status}').format( + nick=nick, + show=show, + status=status) + + self.add_info_message(message, event.timestamp) def _on_room_config_changed(self, _contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + event: events.MUCRoomConfigChanged ) -> None: - # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify - status_codes = properties.muc_status_codes - assert status_codes is not None + self._process_muc_room_config_changed(event) + + def _process_muc_room_config_changed(self, + event: events.MUCRoomConfigChanged + ) -> None: + # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify + status_codes = event.status_codes changes: list[str] = [] + if StatusCode.SHOWING_UNAVAILABLE in status_codes: changes.append(_('Group chat now shows unavailable members')) @@ -873,7 +963,8 @@ def _on_room_config_changed(self, self.client.get_module('Discovery').disco_muc(self.contact.jid) if StatusCode.CONFIG_ROOM_LOGGING in status_codes: - # Can be a presence (see chg_contact_status in groupchat_control.py) + # Can be a presence + # (see chg_contact_status in groupchat_control.py) changes.append(_('Conversations are stored on the server')) if StatusCode.CONFIG_NO_ROOM_LOGGING in status_codes: @@ -888,194 +979,130 @@ def _on_room_config_changed(self, if StatusCode.CONFIG_FULL_ANONYMOUS in status_codes: changes.append(_('Group chat is now fully anonymous')) - for change in changes: - self.add_info_message(change) - - def rejoin(self) -> None: - self.client.get_module('MUC').join(self.contact.jid) - - def _on_user_joined(self, - contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - - nick = user_contact.name - if not properties.is_muc_self_presence: - if contact.is_joined: - self.conversation_view.add_muc_user_joined(nick) - return - - status_codes = properties.muc_status_codes or [] - - if not contact.is_joined: - # We just joined the room - self.add_info_message(_('You (%s) joined the group chat') % nick) - - if StatusCode.NON_ANONYMOUS in status_codes: - self.add_info_message( - _('Any participant is allowed to see your full XMPP Address')) - - if StatusCode.CONFIG_ROOM_LOGGING in status_codes: - self.add_info_message(_('Conversations are stored on the server')) - - if StatusCode.NICKNAME_MODIFIED in status_codes: - self.add_info_message( - _('The server has assigned or modified your nickname in this ' - 'group chat')) + for message in changes: + self.add_info_message(message, event.timestamp) def _on_room_config_finished(self, _contact: GroupchatContact, - _signal_name: str + _signal_name: str, + event: events.MUCRoomConfigFinished ) -> None: + self._process_muc_room_config_finished(event) + + def _process_muc_room_config_finished(self, + event: events.MUCRoomConfigFinished + ) -> None: + self.add_info_message(_('A new group chat has been created')) - def _on_user_affiliation_changed(self, - _contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - affiliation = helpers.get_uf_affiliation(user_contact.affiliation) - nick = user_contact.name + def _on_room_presence_error(self, + _contact: GroupchatContact, + _signal_name: str, + event: events.MUCRoomPresenceError + ) -> None: - assert properties.muc_user is not None - reason = properties.muc_user.reason - reason = '' if reason is None else f': {reason}' + self._process_muc_room_presence_error(event) - actor = properties.muc_user.actor - # Group Chat: You have been kicked by Alice - actor = '' if actor is None else _(' by {actor}').format(actor=actor) + def _process_muc_room_presence_error(self, + event: events.MUCRoomPresenceError + ) -> None: - if properties.is_muc_self_presence: - message = _('** Your Affiliation has been set to ' - '{affiliation}{actor}{reason}').format( - affiliation=affiliation, - actor=actor, - reason=reason) - else: - message = _('** Affiliation of {nick} has been set to ' - '{affiliation}{actor}{reason}').format( - nick=nick, - affiliation=affiliation, - actor=actor, - reason=reason) + error_message = to_user_string(event.error) + self.add_info_message(_('Error: %s') % error_message) - self.add_info_message(message) + def _on_room_destroyed(self, + _contact: GroupchatContact, + _signal_name: str, + event: events.MUCRoomDestroyed + ) -> None: - def _on_user_role_changed(self, - _contact: GroupchatContact, - _signal_name: str, - user_contact: GroupchatParticipant, - properties: PresenceProperties - ) -> None: - role = helpers.get_uf_role(user_contact.role) - nick = user_contact.name + self._process_muc_room_destroyed(event) + + def _process_muc_room_destroyed(self, + event: events.MUCRoomDestroyed + ) -> None: - assert properties.muc_user is not None - reason = properties.muc_user.reason + reason = event.reason reason = '' if reason is None else f': {reason}' - actor = properties.muc_user.actor - # Group Chat: You have been kicked by Alice - actor = '' if actor is None else _(' by {actor}').format(actor=actor) + message = _('Group chat has been destroyed') - if properties.is_muc_self_presence: - message = _('** Your Role has been set to ' - '{role}{actor}{reason}').format(role=role, - actor=actor, - reason=reason) - else: - message = _('** Role of {nick} has been set to ' - '{role}{actor}{reason}').format(nick=nick, - role=role, - actor=actor, - reason=reason) + if event.alternate is not None: + message += '\n' + _('You can join this group chat instead: ' + 'xmpp:%s?join') % str(event.alternate) - self.add_info_message(message) + self.add_info_message(message, event.timestamp) - def _on_room_kicked(self, + def _on_user_joined(self, _contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + _user_contact: GroupchatParticipant, + event: events.MUCUserJoined ) -> None: - status_codes = properties.muc_status_codes or [] - assert properties.muc_user is not None - reason = properties.muc_user.reason - reason = '' if reason is None else f': {reason}' + self._process_muc_user_joined(event) - actor = properties.muc_user.actor - # Group Chat: You have been kicked by Alice - actor = '' if actor is None else _(' by {actor}').format(actor=actor) + def _process_muc_user_joined(self, event: events.MUCUserJoined) -> None: + assert isinstance(self.contact, GroupchatContact) - # Group Chat: We have been removed from the room by Alice: reason - message = _('You have been removed from the group chat{actor}{reason}') + if not event.is_self: + if self.contact.is_joined: + self.conversation_view.add_muc_user_joined(event.nick) + return - if StatusCode.REMOVED_ERROR in status_codes: - # Handle 333 before 307, some MUCs add both - # Group Chat: Server kicked us because of an server error - message = _('You have left due ' - 'to an error{reason}').format(reason=reason) - self.add_info_message(message) + status_codes = event.status_codes or [] - elif StatusCode.REMOVED_KICKED in status_codes: - # Group Chat: We have been kicked by Alice: reason - message = _('You have been ' - 'kicked{actor}{reason}').format(actor=actor, - reason=reason) - self.add_info_message(message) + message = None + if not self.contact.is_joined: + # We just joined the room + message = _('You (%s) joined the group chat') % event.nick - elif StatusCode.REMOVED_BANNED in status_codes: - # Group Chat: We have been banned by Alice: reason - message = _('You have been ' - 'banned{actor}{reason}').format(actor=actor, - reason=reason) - self.add_info_message(message) + if StatusCode.NON_ANONYMOUS in status_codes: + message = _('Any participant is allowed to see your full ' + 'XMPP Address') - elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: - # Group Chat: We were removed because of an affiliation change - reason = _(': Affiliation changed') - message = message.format(actor=actor, reason=reason) - self.add_info_message(message) + if StatusCode.CONFIG_ROOM_LOGGING in status_codes: + message = _('Conversations are stored on the server') - elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: - # Group Chat: Room configuration changed - reason = _(': Group chat configuration changed to members-only') - message = message.format(actor=actor, reason=reason) - self.add_info_message(message) + if StatusCode.NICKNAME_MODIFIED in status_codes: + message = _('The server has assigned or modified your ' + 'nickname in this group chat') - elif StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: - # Group Chat: Kicked because of server shutdown - reason = ': System shutdown' - message = message.format(actor=actor, reason=reason) - self.add_info_message(message) + if message is not None: + self.add_info_message(message, event.timestamp) def _on_user_left(self, _contact: GroupchatContact, _signal_name: str, - user_contact: GroupchatParticipant, - properties: MessageProperties + _user_contact: GroupchatParticipant, + event: events.MUCUserLeft ) -> None: - status_codes = properties.muc_status_codes or [] - nick = user_contact.name - assert properties.muc_user is not None - reason = properties.muc_user.reason + self._process_muc_user_left(event) + + def _process_muc_user_left(self, event: events.MUCUserLeft) -> None: + if event.is_self: + return + + status_codes = event.status_codes or [] + nick = event.nick + + reason = event.reason reason = '' if reason is None else f': {reason}' - actor = properties.muc_user.actor + actor = event.actor # Group Chat: You have been kicked by Alice - actor = '' if actor is None else _(' by {actor}').format(actor=actor) + actor = '' if actor is None else _(' by {actor}').format( + actor=actor) # Group Chat: We have been removed from the room - message = _('{nick} has been removed from the group chat{by}{reason}') + message = _('{nick} has been removed from the group ' + 'chat{by}{reason}') if StatusCode.REMOVED_ERROR in status_codes: # Handle 333 before 307, some MUCs add both self.conversation_view.add_muc_user_left( - nick, properties.muc_user.reason, error=True) + nick, event.reason, error=True) elif StatusCode.REMOVED_KICKED in status_codes: # Group Chat: User was kicked by Alice: reason @@ -1083,7 +1110,6 @@ def _on_user_left(self, 'kicked{actor}{reason}').format(nick=nick, actor=actor, reason=reason) - self.add_info_message(message) elif StatusCode.REMOVED_BANNED in status_codes: # Group Chat: User was banned by Alice: reason @@ -1091,49 +1117,104 @@ def _on_user_left(self, 'banned{actor}{reason}').format(nick=nick, actor=actor, reason=reason) - self.add_info_message(message) elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: reason = _(': Affiliation changed') message = message.format(nick=nick, by=actor, reason=reason) - self.add_info_message(message) elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: reason = _(': Group chat configuration changed to members-only') message = message.format(nick=nick, by=actor, reason=reason) - self.add_info_message(message) else: - self.conversation_view.add_muc_user_left( - nick, properties.muc_user.reason) + self.conversation_view.add_muc_user_left(nick, event.reason) + return - def _on_room_presence_error(self, - _contact: GroupchatContact, - _signal_name: str, - properties: PresenceProperties - ) -> None: + self.add_info_message(message, event.timestamp) - assert properties.error is not None - error_message = to_user_string(properties.error) - self.add_info_message(_('Error: %s') % error_message) + def _on_muc_user_status_show_changed(self, + contact: GroupchatContact, + _signal_name: str, + user_contact: GroupchatParticipant, + properties: PresenceProperties + ) -> None: - def _on_room_destroyed(self, - _contact: GroupchatContact, - _signal_name: str, - properties: PresenceProperties - ) -> None: + if not contact.settings.get('print_status'): + return - destroyed = properties.muc_destroyed - assert destroyed is not None + self.conversation_view.add_user_status(user_contact.name, + user_contact.show.value, + user_contact.status) - reason = destroyed.reason - reason = '' if reason is None else f': {reason}' + def _on_room_voice_request(self, + _contact: GroupchatContact, + _signal_name: str, + properties: MessageProperties + ) -> None: + voice_request = properties.voice_request + assert voice_request is not None - message = _('Group chat has been destroyed') - self.add_info_message(message) + def on_approve() -> None: + self.client.get_module('MUC').approve_voice_request( + self.contact.jid, voice_request) + + ConfirmationDialog( + _('Voice Request'), + _('Voice Request'), + _('%(nick)s from %(room_name)s requests voice') % { + 'nick': voice_request.nick, 'room_name': self.contact.name}, + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Approve'), + callback=on_approve)], + modal=False).show() - alternate = destroyed.alternate - if alternate is not None: - join_message = _('You can join this group chat ' - 'instead: xmpp:%s?join') % str(alternate) - self.add_info_message(join_message) + def add_muc_message(self, + text: str, + tim: float, + contact: str = '', + displaymarking: Optional[Displaymarking] = None, + message_id: Optional[str] = None, + stanza_id: Optional[str] = None, + additional_data: Optional[AdditionalDataDict] = None, + ) -> None: + + assert isinstance(self._contact, GroupchatContact) + + if contact == self._contact.nickname: + kind = 'outgoing' + else: + kind = 'incoming' + # muc-specific chatstate + + self._add_message(text, + kind, + contact, + tim, + displaymarking=displaymarking, + message_id=message_id, + stanza_id=stanza_id, + additional_data=additional_data) + + def _on_room_subject(self, + contact: GroupchatContact, + _signal_name: str, + subject: Optional[MucSubject] + ) -> None: + + if subject is None: + return + + _timestamp, old_subject = self._muc_subjects.get(contact, (None, None)) + if old_subject is not None and old_subject.text == subject.text: + # Probably a rejoin, we already showed that subject + return + + self._muc_subjects[contact] = (time.time(), subject) + + if (app.settings.get('show_subject_on_join') or + not contact.is_joining): + self.conversation_view.add_muc_subject(subject) + + def rejoin(self) -> None: + self.client.get_module('MUC').join(self.contact.jid) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -176,7 +176,7 @@ def add_muc_subject(self, def add_muc_user_left(self, nick: str, - reason: str, + reason: Optional[str], error: bool = False) -> None: assert isinstance(self._contact, GroupchatContact) if not self._contact.settings.get('print_join_left'): ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -18,7 +18,6 @@ import logging -from nbxmpp.structs import PresenceProperties from gi.repository import Gtk from gi.repository import Gdk @@ -27,6 +26,7 @@ from gajim.common import ged from gajim.common import types from gajim.common.events import GcMessageReceived +from gajim.common.events import MUCNicknameChanged from gajim.common.ged import EventHelper from gajim.common.helpers import jid_is_blocked from gajim.common.helpers import message_needs_highlight @@ -76,12 +76,12 @@ def switch_contact(self, contact: types.GroupchatContactT) -> None: def _on_user_nickname_changed(self, _contact: types.GroupchatContact, _signal_name: str, + event: MUCNicknameChanged, old_contact: types.GroupchatParticipant, - new_contact: types.GroupchatParticipant, - properties: PresenceProperties + new_contact: types.GroupchatParticipant ) -> None: - if properties.is_muc_self_presence: + if event.is_self: return old_name = old_contact.name ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -25,7 +25,6 @@ from gi.repository import Gtk from gi.repository import GLib from nbxmpp.const import Affiliation -from nbxmpp.structs import PresenceProperties from gajim.common import app from gajim.common import ged @@ -36,6 +35,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr from gajim.common.events import ApplicationEvent +from gajim.common.events import MUCNicknameChanged from gajim.common.modules.contacts import GroupchatContact from .menus import get_groupchat_roster_menu @@ -281,11 +281,11 @@ def _update_contact(self, self._add_contact(user_contact) def _on_user_nickname_changed(self, - contact: types.GroupchatContact, + _contact: types.GroupchatContact, _signal_name: str, + _event: MUCNicknameChanged, old_contact: types.GroupchatParticipant, - new_contact: types.GroupchatParticipant, - properties: PresenceProperties + new_contact: types.GroupchatParticipant ) -> None: self._remove_contact(old_contact) ===================================== gajim/gtk/main.py ===================================== @@ -62,6 +62,7 @@ from .structs import AccountJidParam from .structs import AddChatActionParams from .structs import actionmethod +from .structs import ChatListEntryParam if TYPE_CHECKING: from .control import ChatControl @@ -626,18 +627,52 @@ def _remove_workspace(self, self.remove_workspace(workspace_id) def remove_workspace(self, workspace_id: str) -> None: + if len(app.settings.get_workspaces()) == 1: + log.warning('Tried to remove the only workspace') + return + was_active = self.get_active_workspace() == workspace_id + chat_list = self.get_chat_list(workspace_id) + open_chats = chat_list.get_open_chats() + + def _continue_removing_workspace(): + new_workspace_id = self._workspace_side_bar.get_other_workspace( + workspace_id) + if new_workspace_id is None: + log.warning('No other workspaces found') + return - success = self._workspace_side_bar.remove_workspace(workspace_id) - if not success: + for open_chat in open_chats: + params = ChatListEntryParam( + workspace_id=new_workspace_id, + source_workspace_id=workspace_id, + account=open_chat['account'], + jid=open_chat['jid']) + self.activate_action('move-chat-to-workspace', + params.to_variant()) + + if was_active: + self.activate_workspace(new_workspace_id) + + self._workspace_side_bar.remove_workspace(workspace_id) + self._chat_page.remove_chat_list(workspace_id) + app.settings.remove_workspace(workspace_id) + + if open_chats: + ConfirmationDialog( + _('Remove Workspace'), + _('Remove Workspace'), + _('This workspace contains chats. All chats will be moved to ' + 'the next workspace. Remove anyway?'), + [DialogButton.make('Cancel', + text=_('_No')), + DialogButton.make('Remove', + callback=_continue_removing_workspace)] + ).show() return - if was_active: - new_active_id = self._workspace_side_bar.get_first_workspace() - self.activate_workspace(new_active_id) - - self._chat_page.remove_chat_list(workspace_id) - app.settings.remove_workspace(workspace_id) + # No chats in chat list, it is save to remove this workspace + _continue_removing_workspace() def _activate_workspace(self, _action: Gio.SimpleAction, ===================================== gajim/gtk/menus.py ===================================== @@ -410,6 +410,7 @@ def get_chat_list_row_menu(workspace_id: str, menu = GajimMenu() params = ChatListEntryParam(workspace_id=workspace_id, + source_workspace_id=workspace_id, account=account, jid=jid) @@ -423,6 +424,7 @@ def get_chat_list_row_menu(workspace_id: str, submenu.add_item(name, 'win.move-chat-to-workspace', params) params = ChatListEntryParam(workspace_id='', + source_workspace_id=workspace_id, account=account, jid=jid) @@ -450,6 +452,7 @@ def get_workspace_params(current_workspace_id: str, continue name = app.settings.get_workspace_setting(workspace_id, 'name') params = ChatListEntryParam(workspace_id=workspace_id, + source_workspace_id=current_workspace_id, account=account, jid=jid) yield name, params @@ -575,9 +578,13 @@ def get_format_menu() -> GajimMenu: def get_workspace_menu(workspace_id: str) -> GajimMenu: + remove_action = 'win.dummy' + if len(app.settings.get_workspaces()) > 1: + remove_action = 'win.remove-workspace' + menuitems: MenuItemListT = [ (_('Edit…'), 'win.edit-workspace', f'"{workspace_id}"'), - (_('Remove'), 'win.remove-workspace', f'"{workspace_id}"'), + (_('Remove'), remove_action, f'"{workspace_id}"'), ] return GajimMenu.from_list(menuitems) ===================================== gajim/gtk/structs.py ===================================== @@ -55,6 +55,7 @@ class AddChatActionParams(VariantMixin): @dataclass class ChatListEntryParam(VariantMixin): workspace_id: str + source_workspace_id: str account: str jid: JID ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -24,8 +24,6 @@ from .avatar import make_workspace_avatar from .avatar_selector import AvatarSelector -from .dialogs import ConfirmationDialog -from .dialogs import DialogButton from .builder import get_builder from .util import rgba_to_float from .util import make_rgba @@ -93,25 +91,9 @@ def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: self.destroy() def _on_remove_workspace(self, _button: Gtk.Button) -> None: - def _on_remove(): - assert self._workspace_id is not None - app.window.remove_workspace(self._workspace_id) - self.destroy() assert self._workspace_id is not None - chat_list = app.window.get_chat_list(self._workspace_id) - open_chats = chat_list.get_open_chats() - if len(open_chats) > 0: - ConfirmationDialog( - _('Remove Workspace'), - _('Remove Workspace'), - _('This workspace contains chats. Remove anyway?'), - [DialogButton.make('Cancel', - text=_('_No')), - DialogButton.make('Remove', - callback=_on_remove)]).show() - return - # No chats in chat list, it is save to remove workspace - _on_remove() + app.window.remove_workspace(self._workspace_id) + self.destroy() def _on_cancel(self, _button: Gtk.Button) -> None: self.destroy() ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -158,6 +158,7 @@ def _process_chat_list_drop(self, workspace_id = '' params = ChatListEntryParam(workspace_id=workspace_id, + source_workspace_id='', account=account, jid=jid) app.window.activate_action('move-chat-to-workspace', @@ -221,12 +222,18 @@ def store_workspace_order(self) -> None: order.remove('add') app.settings.set_app_setting('workspace_order', order) - def remove_workspace(self, workspace_id: str) -> bool: - if len(self._workspaces) == 1: - return False + def remove_workspace(self, workspace_id: str) -> None: row = self._workspaces.pop(workspace_id) self.remove(row) - return True + + def get_other_workspace(self, + exclude_workspace_id: str + ) -> Optional[str]: + + for workspace in self._workspaces.values(): + if workspace.workspace_id != exclude_workspace_id: + return workspace.workspace_id + return None def activate_workspace(self, workspace_id: str) -> None: row = cast(CommonWorkspace, self.get_selected_row()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/60dc9a54a28dffaf9de6db44ff5f839… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/60dc9a54a28dffaf9de6db44ff5f839… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits