Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] release: 1.4.4
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ad2d285 by lovetox at 2022-06-18T08:49:03+02:00 release: 1.4.4 - - - - - 3 changed files: - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,6 +74,7 @@ <control>pointing</control> </recommends> <releases> + <release version="1.4.4" date="2022-06-18" /> <release version="1.4.3" date="2022-06-01" /> <release version="1.4.2" date="2022-05-25" /> <release version="1.4.1" date="2022-05-21" /> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -314,6 +314,6 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: 1.4.3 + tag: 1.4.4 post-install: - install -d /app/plugins ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = '1.4.3' +__version__ = '1.4.4' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7ad2d2856d3fc6e7efbbb2c31813957e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7ad2d2856d3fc6e7efbbb2c31813957e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update ChangeLog
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab0a1ecf by lovetox at 2022-06-18T08:48:11+02:00 chore: Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,63 @@ +Gajim 1.4.4 (18 Jun 2022) + + New + + * Add support for inputing emoji short codes + * Add freedesktop colorscheme preference support + * Add new CLI command --show + * Add new CLI command --cprofile + * Preferences: Add `Action on Close Button` setting + * Preferences: Add `Show in Taskbar` setting + * Preferences: Add D-Bus Interface setting + * Rewrite gajim-remote + * #10040 Logind: Listen to system shutdown and quit Gajim gracefully + + Improvements + + * CreateGroupchatWindow: Enable emoji completion for description + * CreateGroupchatWindow: Produce valid addresses from name + * Gateways: Use avatar if published + * History: Add Keep History 'Until Gajim is Closed' option + * MUC: Base invitation type on MUC type and affiliation + * Rework DBus Remote Interface + * StatusMessageSelector: Enable emoji completion + * #10908 Group chats: Ask for confirmation before leaving + * #10958 #10949 #10943 Preview: Improve layout and display errors + + Performance + + * #10828 Limit message size for styling + + Change + + * Remove remote AdHocCommands feature + * #10986 Remove ask for status settings + + Bug Fixes + + * Chat banner: Show phone image if last message came from a phone + * Flatpak: Determine notification backend caps with dbus + * Groupchat: Prevent automatic roster revealer toggling on join + * Make plugins_repository_enabled available via ACE + * MucJoinLeft: Align timestamp correctly + * NotificationManager: Make displaying an invitation more robust + * StatusIcon: Reliably raise/hide window + * #10900 Groupchat: don't steal active msg textbox focus + * #10913 Groupchat: Load GroupChatState widget early + * #10934 DBus: Unify presence signals + * #10938 JingleAudio: Check if webrtcdsp is available + * #10944 Groupchat: Show correct icon when toggling roster revealer + * #10950 WorkspaceDialog: Show correct settings for workspace if there is only one + * #10953 Status messages: Check for correct setting + * #10955 MessageInputTextView: Don’t remove tags for spell checking + * #10961 Workspaces: Fix image scaling + * #10965 AvatarSelector: Add fail-safes for loading images + * #10977 Limit max quote recursion + * #10978 Make drag & drop more reliable + * #10984 Preview: Don’t fail on invalid IPV6 urls + * #10985 Remote: Don’t fail on list_contacts + * #10989 Preview: Catch PIL errors while generating preview + Gajim 1.4.3 (01 Jun 2022) Improvements View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab0a1ecf7d48af72ea36cc3caccd44cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab0a1ecf7d48af72ea36cc3caccd44cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c5a9e622 by Weblate at 2022-06-18T08:35:16+02:00 chore: Update translations - - - - - 5 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5a9e622aaa72f894729edf252455f82… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5a9e622aaa72f894729edf252455f82… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: Add language to log messages
by Philipp Hörist (＠lovetox) 17 Jun '22

17 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 863bb040 by lovetox at 2022-06-17T23:25:20+02:00 imprv: Add language to log messages - - - - - 10891d42 by lovetox at 2022-06-17T23:25:29+02:00 feat: Add support for pgettext - - - - - 2 changed files: - gajim/common/i18n.py - scripts/update_translations.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -155,6 +155,10 @@ def Q_(text: str) -> str: return text +def P_(context: str, message: str) -> str: + return _translation.pgettext(context, message) + + def ngettext(s_sing: str, s_plural: str, n: int, @@ -194,12 +198,13 @@ def ngettext(s_sing: str, _translation = gettext.translation(DOMAIN, dir_) _ = _translation.gettext if hasattr(locale, 'bindtextdomain'): - locale.bindtextdomain(DOMAIN, dir_) # type: ignore + locale.bindtextdomain(DOMAIN, dir_) except OSError: continue else: break + else: - print('No translations found', file=sys.stderr) - print('Dirs searched: %s' % get_locale_dirs(), file=sys.stderr) _ = _translation.gettext + print('No translations found for', LANG, file=sys.stderr) + print('Dirs searched: %s' % get_locale_dirs(), file=sys.stderr) ===================================== scripts/update_translations.py ===================================== @@ -45,6 +45,7 @@ def update_translation_template() -> bool: '-c#', '--from-code=utf-8', '--keyword=Q_', + '--keyword=P_:1c,2', '--no-location', '--sort-output', '--package-name=Gajim' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d2b1c5c0e6384dbf151a5f80dbf58e9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d2b1c5c0e6384dbf151a5f80dbf58e9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Remove remote AdHocCommands feature
by Philipp Hörist (＠lovetox) 17 Jun '22

17 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d2b1c5c0 by lovetox at 2022-06-17T20:19:33+02:00 fix: Remove remote AdHocCommands feature There is only one AdHocCommand offered and its more of a gimmick. - - - - - 3 changed files: - gajim/common/events.py - − gajim/common/modules/adhoc_commands.py - gajim/common/setting_values.py Changes: ===================================== gajim/common/events.py ===================================== @@ -139,11 +139,13 @@ class SignedIn(ApplicationEvent): account: str conn: 'Client' + @dataclass class LocationChanged(ApplicationEvent): name: str = field(init=False, default='location-changed') info: Optional[LocationData] + @dataclass class MusicTrackChanged(ApplicationEvent): name: str = field(init=False, default='music-track-changed') @@ -175,20 +177,6 @@ class MessageNotSent(ApplicationEvent): time: float -@dataclass -class AdHocCommandError(ApplicationEvent): - name: str = field(init=False, default='adhoc-command-error') - conn: 'Client' - error: str - - -@dataclass -class AdHocCommandActionResponse(ApplicationEvent): - name: str = field(init=False, default='adhoc-command-action-response') - conn: 'Client' - command: Any - - @dataclass class FileProgress(ApplicationEvent): name: str = field(init=False, default='file-progress') ===================================== gajim/common/modules/adhoc_commands.py deleted ===================================== @@ -1,462 +0,0 @@ -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -# Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from __future__ import annotations - -from typing import Callable -from typing import Optional -from typing import Type - -import nbxmpp -from nbxmpp.namespaces import Namespace -from nbxmpp.protocol import Iq -from nbxmpp.structs import IqProperties -from nbxmpp.structs import StanzaHandler -from nbxmpp.modules import dataforms -from nbxmpp.util import generate_id - -from gajim.common import app -from gajim.common import helpers -from gajim.common import types -from gajim.common.events import AdHocCommandError -from gajim.common.events import AdHocCommandActionResponse -from gajim.common.i18n import _ -from gajim.common.modules.base import BaseModule - - -class AdHocCommand: - commandnode = 'command' - commandname = 'The Command' - commandfeatures = (Namespace.DATA,) - - @staticmethod - def is_visible_for(_samejid: bool) -> bool: - """ - This returns True if that command should be visible and invocable for - others - - samejid - True when command is invoked by an entity with the same bare - jid. - """ - return True - - def __init__(self, - conn: types.Client, - jid: str, - sessionid: str - ) -> None: - self.connection = conn - self.jid = jid - self.sessionid = sessionid - - def build_response(self, - request: Iq, - status: str = 'executing', - defaultaction: Optional[str] = None, - actions: Optional[list[str]] = None - ) -> tuple[Iq, nbxmpp.Node]: - assert status in ('executing', 'completed', 'canceled') - - response = request.buildReply('result') - cmd = response.getTag('command', namespace=Namespace.COMMANDS) - cmd.setAttr('sessionid', self.sessionid) - cmd.setAttr('node', self.commandnode) - cmd.setAttr('status', status) - if defaultaction is not None or actions is not None: - if defaultaction is not None: - assert defaultaction in ('cancel', 'execute', 'prev', 'next', - 'complete') - attrs = {'action': defaultaction} - else: - attrs = {} - - cmd.addChild('actions', attrs, actions) - return response, cmd - - def bad_request(self, stanza: Iq) -> None: - self.connection.connection.send( - nbxmpp.Error(stanza, Namespace.STANZAS + ' bad-request')) - - def cancel(self, request: Iq) -> bool: - response = self.build_response(request, status='canceled')[0] - self.connection.connection.send(response) - return False # finish the session - - -class ChangeStatusCommand(AdHocCommand): - commandnode = 'change-status' - commandname = _('Change status information') - - def __init__(self, - conn: types.Client, - jid: str, - sessionid: str - ) -> None: - AdHocCommand.__init__(self, conn, jid, sessionid) - self._callback: Callable[..., bool] = self.first_step - - @staticmethod - def is_visible_for(samejid: bool) -> bool: - """ - Change status is visible only if the entity has the same bare jid - """ - return samejid - - def execute(self, request: Iq): - return self._callback(request) - - def first_step(self, request: Iq) -> bool: - # first query... - response, cmd = self.build_response(request, - defaultaction='execute', - actions=['execute']) - - cmd.addChild( - node=dataforms.SimpleDataForm( - title=_('Change status'), - instructions=_('Set the presence type and description'), - fields=[ - dataforms.create_field( - 'list-single', - var='presence-type', - label='Type of presence:', - options=[ - ('chat', _('Free for chat')), - ('online', _('Online')), - ('away', _('Away')), - ('xa', _('Extended away')), - ('dnd', _('Do not disturb')), - ('offline', _('Offline - disconnect'))], - value='online', - required=True), - dataforms.create_field( - 'text-multi', - var='presence-desc', - label=_('Presence description:')) - ] - ) - ) - - self.connection.connection.send(response) - - # for next invocation - self._callback = self.second_step - - return True # keep the session - - def second_step(self, request: Iq) -> bool: - # check if the data is correct - try: - form = dataforms.SimpleDataForm( - extend=request.getTag('command').getTag('x')) - except Exception: - self.bad_request(request) - return False - - try: - presencetype = form['presence-type'].value - if presencetype not in ('chat', 'online', 'away', - 'xa', 'dnd', 'offline'): - self.bad_request(request) - return False - except Exception: - # KeyError if there's no presence-type field in form or - # AttributeError if that field is of wrong type - self.bad_request(request) - return False - - try: - presencedesc = form['presence-desc'].value - except Exception: # same exceptions as in last comment - presencedesc = '' - - response, cmd = self.build_response(request, status='completed') - cmd.addChild('note', {}, _('The status has been changed.')) - - # if going offline, we need to push response so it won't go into - # queue and disappear - self.connection.connection.send(response, - now=presencetype == 'offline') - - # send new status - app.get_client(self.connection.name).change_status( - presencetype, presencedesc) - - return False # finish the session - - -class AdHocCommands(BaseModule): - - _nbxmpp_extends = 'AdHoc' - _nbxmpp_methods = [ - 'request_command_list', - 'execute_command', - ] - - def __init__(self, con: types.Client) -> None: - BaseModule.__init__(self, con) - - self.handlers = [ - StanzaHandler(name='iq', - callback=self._execute_command_received, - typ='set', - ns=Namespace.COMMANDS), - ] - - # a list of all commands exposed: node -> command class - self._commands: dict[str, Type[AdHocCommand]] = {} - if app.settings.get('remote_commands'): - for cmdobj in (ChangeStatusCommand,): - self._commands[cmdobj.commandnode] = cmdobj - - # a list of sessions; keys are tuples (jid, sessionid, node) - self._sessions: dict[tuple[str, str, str], AdHocCommand] = {} - - def get_own_bare_jid(self) -> str: - return self._con.get_own_jid().bare - - def is_same_jid(self, jid: str) -> bool: - """ - Test if the bare jid given is the same as our bare jid - """ - return nbxmpp.JID.from_string(jid).bare == self.get_own_bare_jid() - - def command_list_query(self, stanza: Iq) -> None: - iq = stanza.buildReply('result') - jid = helpers.get_full_jid_from_iq(stanza) - query = iq.getTag('query') - # buildReply don't copy the node attribute. Re-add it - query.setAttr('node', Namespace.COMMANDS) - - for node, cmd in self._commands.items(): - if cmd.is_visible_for(self.is_same_jid(jid)): - query.addChild('item', { - # TODO: find the jid - 'jid': str(self._con.get_own_jid()), - 'node': node, - 'name': cmd.commandname}) - - self._con.connection.send(iq) - - def command_info_query(self, stanza: Iq) -> bool: - """ - Send disco#info result for query for command (XEP-0050, example 6.). - Return True if the result was sent, False if not - """ - try: - jid = helpers.get_full_jid_from_iq(stanza) - except helpers.InvalidFormat: - self._log.warning('Invalid JID: %s, ignoring it', stanza.getFrom()) - return False - - node = stanza.getTagAttr('query', 'node') - - if node not in self._commands: - return False - - cmd = self._commands[node] - if cmd.is_visible_for(self.is_same_jid(jid)): - iq = stanza.buildReply('result') - query = iq.getTag('query') - query.addChild('identity', - attrs={'type': 'command-node', - 'category': 'automation', - 'name': cmd.commandname}) - query.addChild('feature', attrs={'var': Namespace.COMMANDS}) - for feature in cmd.commandfeatures: - query.addChild('feature', attrs={'var': feature}) - - self._con.connection.send(iq) - return True - - return False - - def command_items_query(self, stanza: Iq) -> bool: - """ - Send disco#items result for query for command. - Return True if the result was sent, False if not. - """ - jid = helpers.get_full_jid_from_iq(stanza) - node = stanza.getTagAttr('query', 'node') - - if node not in self._commands: - return False - - cmd = self._commands[node] - if cmd.is_visible_for(self.is_same_jid(jid)): - iq = stanza.buildReply('result') - self._con.connection.send(iq) - return True - - return False - - def _execute_command_received(self, - _con: types.xmppClient, - stanza: Iq, - _properties: IqProperties - ) -> None: - jid = helpers.get_full_jid_from_iq(stanza) - - cmd = stanza.getTag('command') - if cmd is None: - self._log.error('Malformed stanza (no command node) %s', stanza) - raise nbxmpp.NodeProcessed - - node = cmd.getAttr('node') - if node is None: - self._log.error('Malformed stanza (no node attr) %s', stanza) - raise nbxmpp.NodeProcessed - - sessionid = cmd.getAttr('sessionid') - if sessionid is None: - # we start a new command session - # only if we are visible for the jid and command exist - if node not in self._commands: - self._con.connection.send( - nbxmpp.Error( - stanza, Namespace.STANZAS + ' item-not-found')) - self._log.warning('Comand %s does not exist: %s', node, jid) - raise nbxmpp.NodeProcessed - - newcmd = self._commands[node] - if not newcmd.is_visible_for(self.is_same_jid(jid)): - self._log.warning('Command not visible for jid: %s', jid) - raise nbxmpp.NodeProcessed - - # generate new sessionid - sessionid = generate_id() - - # create new instance and run it - obj = newcmd(conn=self, jid=jid, sessionid=sessionid) - rc = obj.execute(stanza) - if rc: - self._sessions[(jid, sessionid, node)] = obj - self._log.info('Comand %s executed: %s', node, jid) - raise nbxmpp.NodeProcessed - - # the command is already running, check for it - magictuple = (jid, sessionid, node) - if magictuple not in self._sessions: - # we don't have this session... ha! - self._log.warning('Invalid session %s', magictuple) - raise nbxmpp.NodeProcessed - - action = cmd.getAttr('action') - obj = self._sessions[magictuple] - - try: - if action == 'cancel': - rc = obj.cancel(stanza) - elif action == 'prev': - rc = obj.prev(stanza) - elif action == 'next': - rc = obj.next(stanza) - elif action == 'execute' or action is None: - rc = obj.execute(stanza) - elif action == 'complete': - rc = obj.complete(stanza) - else: - # action is wrong. stop the session, send error - raise AttributeError - except AttributeError as error: - # the command probably doesn't handle invoked action... - # stop the session, return error - del self._sessions[magictuple] - self._log.warning('Wrong action %s %s', node, jid) - raise nbxmpp.NodeProcessed from error - - # delete the session if rc is False - if not rc: - del self._sessions[magictuple] - - raise nbxmpp.NodeProcessed - - def send_command(self, - jid: str, - node: str, - session_id: str, - form: dataforms.SimpleDataForm, - action: str = 'execute' - ) -> None: - """ - Send the command with data form. Wait for reply - """ - self._log.info('Send Command: %s %s %s %s', - jid, node, session_id, action) - stanza = nbxmpp.Iq(typ='set', to=jid) - cmdnode = stanza.addChild('command', - namespace=Namespace.COMMANDS, - attrs={'node': node, - 'action': action}) - - if session_id: - cmdnode.setAttr('sessionid', session_id) - - if form: - cmdnode.addChild(node=form.get_purged()) - - self._con.connection.SendAndCallForResponse( - stanza, self._action_response_received) - - def _action_response_received(self, - _nbxmpp_client: types.xmppClient, - stanza: Iq - ) -> None: - if not nbxmpp.isResultNode(stanza): - self._log.info('Error: %s', stanza.getError()) - - app.ged.raise_event( - AdHocCommandError(conn=self._con, - error=stanza.getError())) - return - self._log.info('Received action response') - command = stanza.getTag('command') - app.ged.raise_event( - AdHocCommandActionResponse(conn=self._con, command=command)) - - def send_cancel(self, - jid: str, - node: str, - session_id: str - ) -> None: - """ - Send the command with action='cancel' - """ - self._log.info('Cancel: %s %s %s', jid, node, session_id) - stanza = nbxmpp.Iq(typ='set', to=jid) - stanza.addChild('command', namespace=Namespace.COMMANDS, - attrs={ - 'node': node, - 'sessionid': session_id, - 'action': 'cancel' - }) - - self._con.connection.SendAndCallForResponse( - stanza, self._cancel_result_received) - - def _cancel_result_received(self, - _nbxmpp_client: types.xmppClient, - stanza: Iq - ) -> None: - if not nbxmpp.isResultNode(stanza): - self._log.warning('Error: %s', stanza.getError()) - else: - self._log.info('Cancel successful') ===================================== gajim/common/setting_values.py ===================================== @@ -79,7 +79,6 @@ class _ACCOUNT_DEFAULT: 'preview_anonymous_muc', 'preview_verify_https', 'print_status_in_chats', - 'remote_commands', 'remote_control', 'save_main_window_position', 'send_on_ctrl_enter', @@ -257,7 +256,6 @@ class _ACCOUNT_DEFAULT: 'preview_size': 300, 'preview_verify_https': True, 'print_status_in_chats': False, - 'remote_commands': False, 'remote_control': False, 'restore_timeout': -1, 'roster_theme': 'default', @@ -656,7 +654,6 @@ class WorkspaceSettings(TypedDict): 'notification_timeout': '', 'notify_on_all_muc_messages': '', 'plugins_repository_enabled': _('If enabled, Gajim offers to download plugins hosted on gajim.org'), - 'remote_commands': _('If enabled, Gajim will execute XEP-0146 Commands.'), 'restore_timeout': _('How far back in time (minutes) chat history is restored. -1 means no limit.'), 'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'), 'search_engine': '', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d2b1c5c0e6384dbf151a5f80dbf58e9c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d2b1c5c0e6384dbf151a5f80dbf58e9c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: feat: Preferences: Add `Action on Close Button` setting
by Philipp Hörist (＠lovetox) 17 Jun '22

17 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 83906f55 by lovetox at 2022-06-17T19:50:35+02:00 feat: Preferences: Add `Action on Close Button` setting The new popover setting allows for more than two values and is a more flexibel approach. - - - - - f2702018 by lovetox at 2022-06-17T19:58:06+02:00 fix: Preferences: Remove `Minimize to Tray` setting It’s better to leave this up to the window manager and don’t mess with it. Users who don’t want to minimize to tray can either use the tray show/hide button or set the `Action on Close` setting accordingly. - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/gtk/main.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -66,8 +66,6 @@ class _ACCOUNT_DEFAULT: 'ignore_incoming_attention', 'is_window_visible', 'log_contact_status_changes', - 'minimize_on_window_delete', - 'minimize_to_tray', 'muc_prefer_direct_msg', 'notification_preview_message', 'notify_on_all_muc_messages', @@ -138,6 +136,7 @@ class _ACCOUNT_DEFAULT: ] StringSettings = Literal[ + 'action_on_close', 'audio_input_device', 'audio_output_device', 'autoaway_message', @@ -234,8 +233,7 @@ class _ACCOUNT_DEFAULT: 'mainwin_width': 1000, 'mainwin_x_position': 0, 'mainwin_y_position': 0, - 'minimize_on_window_delete': True, - 'minimize_to_tray': False, + 'action_on_close': 'hide', 'muc_highlight_words': '', 'muc_prefer_direct_msg': True, 'muclumbus_api_http_uri': 'https://search.jabber.network/api/1.0/search', ===================================== gajim/gtk/main.py ===================================== @@ -422,11 +422,13 @@ def _on_window_delete(self, _event: Gdk.Event ) -> int: - if app.settings.get('minimize_on_window_delete'): - if app.settings.get('minimize_to_tray'): - self.hide() - else: - self.minimize() + action = app.settings.get('action_on_close') + if action == 'hide': + self.hide() + return Gdk.EVENT_STOP + + if action == 'minimize': + self.minimize() return Gdk.EVENT_STOP if not app.settings.get('confirm_on_window_delete'): ===================================== gajim/gtk/preferences.py ===================================== @@ -191,6 +191,12 @@ def __init__(self, *args: Any) -> None: 'last_state': _('Restore last state'), } + action_on_close_items = { + 'hide': _('Hide'), + 'minimize': _('Minimize'), + 'quit': _('Quit'), + } + settings = [ Setting(SettingKind.POPOVER, _('Show on Startup'), @@ -199,17 +205,12 @@ def __init__(self, *args: Any) -> None: props={'entries': main_window_on_startup_items}, desc=_('Show window when starting Gajim')), - Setting(SettingKind.SWITCH, - _('Minimize on Close'), - SettingType.CONFIG, - 'minimize_on_window_delete', - desc=_('Minimize when closing Gajim’s window')), - - Setting(SettingKind.SWITCH, - _('Minimize to Tray'), + Setting(SettingKind.POPOVER, + _('Action on Close'), SettingType.CONFIG, - 'minimize_to_tray', - desc=_('Hide window to system tray when minimized')), + 'action_on_close', + props={'entries': action_on_close_items}, + desc=_('Action when closing Gajim’s window')), Setting(SettingKind.SWITCH, _('Show in Taskbar'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9fb23514a863ba399a02ba4b3608dbb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9fb23514a863ba399a02ba4b3608dbb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: feat: Preferences: Add D-Bus Interface setting
by Philipp Hörist (＠lovetox) 17 Jun '22

17 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 91c0dba2 by lovetox at 2022-06-17T18:46:38+02:00 feat: Preferences: Add D-Bus Interface setting - - - - - 9fb23514 by lovetox at 2022-06-17T18:47:43+02:00 chore: Remove unused code - - - - - 3 changed files: - gajim/common/exceptions.py - gajim/common/setting_values.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/exceptions.py ===================================== @@ -17,33 +17,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from gajim.common.i18n import _ - - -class ServiceNotAvailable(Exception): - """ - This exception is raised when we cannot use Gajim remotely' - """ - - def __init__(self) -> None: - Exception.__init__(self) - - def __str__(self) -> str: - return _('Service not available: Gajim is not running, or remote_control is False') - - -class SessionBusNotPresent(Exception): - """ - This exception indicates that there is no session daemon - """ - - def __init__(self) -> None: - Exception.__init__(self) - - def __str__(self) -> str: - return _('Session bus is not available.\nTry reading %(url)s') % \ - {'url': 'https://dev.gajim.org/gajim/gajim/wikis/help/GajimDBus'} - class GajimGeneralException(Exception): """ ===================================== gajim/common/setting_values.py ===================================== @@ -659,7 +659,6 @@ class WorkspaceSettings(TypedDict): 'notify_on_all_muc_messages': '', 'plugins_repository_enabled': _('If enabled, Gajim offers to download plugins hosted on gajim.org'), 'remote_commands': _('If enabled, Gajim will execute XEP-0146 Commands.'), - 'remote_control': _('If checked, Gajim can be controlled remotely using gajim-remote.'), 'restore_timeout': _('How far back in time (minutes) chat history is restored. -1 means no limit.'), 'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'), 'search_engine': '', ===================================== gajim/gtk/preferences.py ===================================== @@ -1000,10 +1000,12 @@ def _purge() -> None: text=_('_Purge'), callback=_purge)]).show() + class Advanced(PreferenceBox): def __init__(self, pref_window: Preferences) -> None: settings = [ + Setting(SettingKind.SWITCH, _('Debug Logging'), SettingType.VALUE, @@ -1011,6 +1013,14 @@ def __init__(self, pref_window: Preferences) -> None: props={'button-icon-name': 'folder-symbolic', 'button-callback': self._on_open_debug_logs}, callback=self._on_debug_logging), + + Setting(SettingKind.SWITCH, + _('D-Bus Interface'), + SettingType.CONFIG, + 'remote_control', + desc=_('Allow Gajim to broadcast useful information via ' + 'D-Bus. It also allows other applications to ' + 'control Gajim remotely.')), ] PreferenceBox.__init__(self, settings) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/809674b33152bcf5b655be6a1a48993… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/809674b33152bcf5b655be6a1a48993… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: MUC: Base invitation type on MUC type and affiliation
by Philipp Hörist (＠lovetox) 17 Jun '22

17 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 809674b3 by wurstsalat at 2022-06-17T17:49:39+02:00 imprv: MUC: Base invitation type on MUC type and affiliation Conditions are listed here: https://dev.gajim.org/gajim/gajim/-/wikis/development/MUC-Invite-Logic - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -58,6 +58,7 @@ from gajim.common.structs import MUCPresenceData 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 log = logging.getLogger('gajim.c.m.muc') @@ -431,7 +432,7 @@ def _on_config_result(self, task: Task) -> None: self.set_affiliation(result.jid, user_list) for jid in invites: - self.invite(result.jid, jid) + self.invite(result.jid, JID.from_string(jid)) def _on_disco_result_after_config(self, task: Task) -> None: try: @@ -919,17 +920,27 @@ def _on_disco_result_after_invite(self, task: Task) -> None: **invite_data._asdict())) def invite(self, - room: str, - jid: str, + room: JID, + jid: JID, reason: Optional[str] = None, continue_: bool = False ) -> str: - type_ = InviteType.MEDIATED - contact = self._get_contact(jid) - if contact and contact.supports(Namespace.CONFERENCE): + if helpers.get_muc_context(room) == 'private': + room_contact = self._get_contact(room) + assert isinstance(room_contact, GroupchatContact) + self_contact = room_contact.get_self() + affiliation = self_contact.affiliation + admin = affiliation.is_owner or affiliation.is_admin + if admin: + self.set_affiliation( + room, {jid: {'affiliation': 'member'}}) + type_ = InviteType.DIRECT + else: + type_ = InviteType.MEDIATED + else: type_ = InviteType.DIRECT - password = self._mucs[room].password + password = self._mucs[str(room)].password self._log.info('Invite %s to %s', jid, room) return self._nbxmpp('MUC').invite( room, jid, reason, password, continue_, type_) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -410,13 +410,16 @@ def _on_invite_ready(self, def _on_invite_clicked(self, _button: Gtk.Button) -> None: invitees = self._invite_box.get_invitees() for jid in invitees: - self.invite(jid) + self.invite(JID.from_string(jid)) self._show_page('groupchat') - def invite(self, contact_jid: str) -> None: - self._client.get_module('MUC').invite(self.room_jid, contact_jid) + def invite(self, invited_jid: JID) -> None: + self._client.get_module('MUC').invite( + self.contact.jid, invited_jid) + invited_contact = self._client.get_module('Contacts').get_contact( + invited_jid) self.add_info_message( - _('%s has been invited to this group chat') % contact_jid) + _('%s has been invited to this group chat') % invited_contact.name) def _on_destroy_room(self, _button: Gtk.Button) -> None: self.xml.destroy_reason_entry.grab_focus() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/809674b33152bcf5b655be6a1a489938… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/809674b33152bcf5b655be6a1a489938… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Fix codestyle errors
by Philipp Hörist (＠lovetox) 17 Jun '22

17 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: fac52588 by lovetox at 2022-06-17T16:53:13+02:00 chore: Fix codestyle errors - - - - - daa6ac86 by lovetox at 2022-06-17T16:57:53+02:00 ci: Update pylint.sh Ignore checks which are executed with flake8 - - - - - 8 changed files: - .ci/pylint.sh - gajim/common/jingle_ft.py - gajim/common/logging_helpers.py - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/features.py - gajim/gtk/types.py - setup.cfg Changes: ===================================== .ci/pylint.sh ===================================== @@ -39,6 +39,8 @@ PYLINT=${PYLINT:-pylint} # W1115 non-str-assignment-to-dunder-name # W1116 isinstance-second-argument-not-valid-type +IGNORE_FLAKE8='C0301' + IGNORE_PYRIGHT='E1101,E1102,E1111,E1120,E1121,E1123,E1124,E1125,E1126,E1127,E1128,E1129,E1130,E1131,E1132,E1133,E1134,E1135,E1136,E1137,E1138,E1139,E1140,E1141,E1142,I1101,W0212,W1113,W1114,W1115,W1116' IGNORE_ALWAYS='R0801,C0209,W0237,W0707,R1732,W1404,W1406,R1725' @@ -49,10 +51,10 @@ IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,R0201,R0904,R0915,R "$PYLINT" --version -"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_ERRORS" --ignore=modules,dbus,gtk "$@" -"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_GTK_MODULE_ERRORS" "$@/gtk" -"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,E0401,C0415" "$@/common/modules" -"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS" "$@/common/dbus" +"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_FLAKE8,$IGNORE_ERRORS" --ignore=modules,dbus,gtk "$@" +"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_FLAKE8,$IGNORE_GTK_MODULE_ERRORS" "$@/gtk" +"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_FLAKE8,E0401,C0415" "$@/common/modules" +"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_FLAKE8," "$@/common/dbus" # C0103 invalid-name # C0209 use-f-string ===================================== gajim/common/jingle_ft.py ===================================== @@ -131,23 +131,23 @@ def __init__(self, self.nominated_cand = {} self.state = State.NOT_STARTED self.states = { - State.INITIALIZED : StateInitialized(self), - State.CAND_SENT : StateCandSent(self), - State.CAND_RECEIVED : StateCandReceived(self), - State.TRANSFERRING : StateTransfering(self), - State.TRANSPORT_REPLACE : StateTransportReplace(self), - State.CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) + State.INITIALIZED: StateInitialized(self), + State.CAND_SENT: StateCandSent(self), + State.CAND_RECEIVED: StateCandReceived(self), + State.TRANSFERRING: StateTransfering(self), + State.TRANSPORT_REPLACE: StateTransportReplace(self), + State.CAND_SENT_AND_RECEIVED: StateCandSentAndRecv(self) } cert_name = (configpaths.get('MY_CERT') / jingle_xtls.SELF_SIGNED_CERTIFICATE) - if not (cert_name.with_suffix('.cert').exists() - and cert_name.with_suffix('.pkey').exists()): + if not (cert_name.with_suffix('.cert').exists() and + cert_name.with_suffix('.pkey').exists()): jingle_xtls.make_certs(cert_name, 'gajim') def __state_changed(self, nextstate: State, - args: Optional[dict[str, Any]] =None + args: Optional[dict[str, Any]] = None ) -> None: # Executes the next state action and sets the next state current_state = self.state @@ -284,18 +284,21 @@ def __on_session_initiate_sent(self, def __send_hash(self) -> None: # Send hash in a session info checksum = nbxmpp.Node(tag='checksum', - payload=[nbxmpp.Node(tag='file', - payload=[self._compute_hash()])]) + payload=[ + nbxmpp.Node(tag='file', + payload=[self._compute_hash()]) + ]) checksum.setNamespace(Namespace.JINGLE_FILE_TRANSFER_5) self.session.__session_info(checksum) pjid = app.get_jid_without_resource(self.session.peerjid) - file_info = {'name' : self.file_props.name, - 'file-name' : self.file_props.file_name, - 'hash' : self.file_props.hash_, - 'size' : self.file_props.size, - 'date' : self.file_props.date, - 'peerjid' : pjid - } + file_info = { + 'name': self.file_props.name, + 'file-name': self.file_props.file_name, + 'hash': self.file_props.hash_, + 'size': self.file_props.size, + 'date': self.file_props.date, + 'peerjid': pjid + } self.session.connection.get_module('Jingle').set_file_info(file_info) def _compute_hash(self) -> Optional[nbxmpp.Hashes2]: @@ -311,7 +314,7 @@ def _compute_hash(self) -> Optional[nbxmpp.Hashes2]: hash_ = h.calculateHash(self.file_props.algo, file_) file_.close() # DEBUG - #hash_ = '1294809248109223' + # hash_ = '1294809248109223' if not hash_: # Hash algorithm not supported return @@ -332,7 +335,7 @@ def __on_session_accept(self, log.info("__on_session_accept") con = self.session.connection security = content.getTag('security') - if not security: # responder can not verify our fingerprint + if not security: # responder can not verify our fingerprint self.use_security = False else: fingerprint = security.getTag('fingerprint') @@ -392,11 +395,11 @@ def __on_session_terminate(self, log.info("__on_session_terminate") def __on_session_info(self, - stanza: nbxmpp.Node, - content: nbxmpp.Node, - error: Optional[nbxmpp.Node], - action: str - ) -> None: + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: pass def __on_transport_accept(self, @@ -452,7 +455,7 @@ def __on_transport_info(self, self.__state_changed(State.TRANSFERRING) raise nbxmpp.NodeProcessed else: - args = {'candError' : True} + args = {'candError': True} self.__state_changed(State.CAND_RECEIVED, args) return if cand_used: @@ -463,13 +466,13 @@ def __on_transport_info(self, streamhost_used = cand break if streamhost_used is None or streamhost_used['type'] == 'proxy': - if app.socks5queue.listener and \ - not app.socks5queue.listener.connections: + if (app.socks5queue.listener and + not app.socks5queue.listener.connections): app.socks5queue.listener.disconnect() if content.getTag('transport').getTag('activated'): self.state = State.TRANSFERRING app.socks5queue.send_file(self.file_props, - self.session.connection.name, 'client') + self.session.connection.name, 'client') return args = {'content': content, 'sendCand': False} @@ -490,8 +493,8 @@ def __on_iq_result(self, if self.state in (State.NOT_STARTED, State.CAND_RECEIVED): self.__state_changed(State.INITIALIZED) elif self.state == State.CAND_SENT_AND_RECEIVED: - if not self.nominated_cand['our-cand'] and \ - not self.nominated_cand['peer-cand']: + if (not self.nominated_cand['our-cand'] and + not self.nominated_cand['peer-cand']): if not self.weinitiate: return self.__state_changed(State.TRANSPORT_REPLACE) @@ -519,15 +522,15 @@ def on_connect(self, streamhost): log.info('send_candidate_used') if streamhost is None: return - args = {'streamhost' : streamhost, - 'sendCand' : True} + args = {'streamhost': streamhost, + 'sendCand': True} self.nominated_cand['our-cand'] = streamhost self.__send_candidate(args) def _on_connect_error(self, sid: str) -> None: log.info('connect error, sid=%s', sid) - args = {'candError' : True, - 'sendCand' : True} + args = {'candError': True, + 'sendCand': True} self.__send_candidate(args) def __send_candidate(self, args: dict[str, Any]) -> None: @@ -550,11 +553,13 @@ def _listen_host(self) -> None: fingerprint = None if self.use_security: fingerprint = 'server' - listener = app.socks5queue.start_listener(port, sha_str, - self._store_socks5_sid, - self.file_props, - fingerprint=fingerprint, - typ='sender' if self.weinitiate else 'receiver') + listener = app.socks5queue.start_listener( + port, + sha_str, + self._store_socks5_sid, + self.file_props, + fingerprint=fingerprint, + typ='sender' if self.weinitiate else 'receiver') if not listener: # send error message, notify the user return @@ -583,4 +588,5 @@ def start_ibb_transfer(self) -> None: def get_content(desc) -> JingleFileTransfer: return JingleFileTransfer + contents[Namespace.JINGLE_FILE_TRANSFER_5] = get_content ===================================== gajim/common/logging_helpers.py ===================================== @@ -82,23 +82,23 @@ def parseAndSetLogLevels(arg: str) -> None: class colors: - NONE = chr(27) + "[0m" - BLACk = chr(27) + "[30m" - RED = chr(27) + "[31m" - GREEN = chr(27) + "[32m" - BROWN = chr(27) + "[33m" - BLUE = chr(27) + "[34m" - MAGENTA = chr(27) + "[35m" - CYAN = chr(27) + "[36m" - LIGHT_GRAY = chr(27) + "[37m" - DARK_GRAY = chr(27) + "[30;1m" - BRIGHT_RED = chr(27) + "[31;1m" + NONE = chr(27) + "[0m" + BLACK = chr(27) + "[30m" + RED = chr(27) + "[31m" + GREEN = chr(27) + "[32m" + BROWN = chr(27) + "[33m" + BLUE = chr(27) + "[34m" + MAGENTA = chr(27) + "[35m" + CYAN = chr(27) + "[36m" + LIGHT_GRAY = chr(27) + "[37m" + DARK_GRAY = chr(27) + "[30;1m" + BRIGHT_RED = chr(27) + "[31;1m" BRIGHT_GREEN = chr(27) + "[32;1m" - YELLOW = chr(27) + "[33;1m" - BRIGHT_BLUE = chr(27) + "[34;1m" - PURPLE = chr(27) + "[35;1m" - BRIGHT_CYAN = chr(27) + "[36;1m" - WHITE = chr(27) + "[37;1m" + YELLOW = chr(27) + "[33;1m" + BRIGHT_BLUE = chr(27) + "[34;1m" + PURPLE = chr(27) + "[35;1m" + BRIGHT_CYAN = chr(27) + "[36;1m" + WHITE = chr(27) + "[37;1m" def colorize(text: str, color: str) -> str: ===================================== gajim/gtk/chat_list.py ===================================== @@ -596,7 +596,7 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, if self.contact.is_groupchat and not self.contact.can_notify(): self._ui.unread_label.get_style_context().add_class( - 'unread-counter-silent') + 'unread-counter-silent') # Get last chat message from archive line = app.storage.archive.get_last_conversation_line(account, jid) ===================================== gajim/gtk/controls/base.py ===================================== @@ -1146,7 +1146,7 @@ def add_message(self, displaymarking: Optional[Displaymarking] = None, msg_log_id: Optional[int] = None, message_id: Optional[str] = None, - stanza_id: Optional[str] =None, + stanza_id: Optional[str] = None, additional_data: Optional[AdditionalDataDict] = None ) -> None: ===================================== gajim/gtk/features.py ===================================== @@ -118,13 +118,6 @@ def _get_features(self) -> list[Feature]: _('Requires: libxss'), _('No additional requirements'), auto_status_enabled), -# Feature(_('Location detection'), -# app.is_installed('GEOCLUE'), -# _('Enables Gajim to be location-aware, if the user decides ' -# 'to publish the device’s location'), -# _('Requires: geoclue'), -# _('Feature is not available under Windows'), -# None), Feature(_('Notification Sounds'), notification_sounds_available, _('Enables Gajim to play sounds for various notifications'), ===================================== gajim/gtk/types.py ===================================== @@ -38,8 +38,7 @@ from .conversation.rows.scroll_hint import ScrollHintRow - -ControlT = Union [ +ControlT = Union[ 'BaseControl', 'ChatControl', 'PrivateChatControl', ===================================== setup.cfg ===================================== @@ -6,14 +6,17 @@ exclude = dist, debian_build, test, - typings + typings, gajim/command_system, - gajim/common/config.py - gajim/common/optparser.py + gajim/common/config.py, + gajim/common/optparser.py, + gajim/common/socks5.py, + gajim/gui, max-complexity = 15 builtins=_ max-line-length = 80 statistics = True +count = True [metadata] name = gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/246e509049b365076f55547d8f8b090… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/246e509049b365076f55547d8f8b090… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Fix codestyle errors
by Philipp Hörist (＠lovetox) 17 Jun '22

17 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 246e5090 by lovetox at 2022-06-17T16:26:02+02:00 chore: Fix codestyle errors - - - - - 7 changed files: - gajim/common/modules/bits_of_binary.py - gajim/common/modules/contacts.py - gajim/common/modules/httpupload.py - gajim/common/modules/ibb.py - gajim/common/modules/jingle.py - gajim/common/modules/misc.py - gajim/common/modules/user_avatar.py Changes: ===================================== gajim/common/modules/bits_of_binary.py ===================================== @@ -86,6 +86,7 @@ def _on_bob_received(self, args = func[1] pos = func[2] bob_data = data.getData() + def recurs(node, cid, data): if node.getData() == 'cid:' + cid: node.setData(data) ===================================== gajim/common/modules/contacts.py ===================================== @@ -62,21 +62,23 @@ def __init__(self, account: str, jid: JID) -> None: self._jid = jid @overload - def get(self, setting: StringGroupChatSettings) -> str: ... + def get(self, setting: StringGroupChatSettings) -> str: ... # noqa: E704 @overload - def get(self, setting: BoolGroupChatSettings) -> bool: ... + def get(self, setting: BoolGroupChatSettings) -> bool: ... # noqa: E704 @overload - def get(self, setting: IntGroupChatSettings) -> int: ... + def get(self, setting: IntGroupChatSettings) -> int: ... # noqa: E704 + def get(self, setting: Any) -> Any: return app.settings.get_group_chat_setting( self._account, self._jid, setting) @overload - def set(self, setting: StringGroupChatSettings, value: str) -> None: ... + def set(self, setting: StringGroupChatSettings, value: str) -> None: ... # noqa: E501, E704 @overload - def set(self, setting: BoolGroupChatSettings, value: bool) -> None: ... + def set(self, setting: BoolGroupChatSettings, value: bool) -> None: ... # noqa: E501, E704 @overload - def set(self, setting: IntGroupChatSettings, value: int) -> None: ... + def set(self, setting: IntGroupChatSettings, value: int) -> None: ... # noqa: E501, E704 + def set(self, setting: Any, value: Any) -> None: app.settings.set_group_chat_setting( self._account, self._jid, setting, value) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -251,6 +251,7 @@ def _check_certificate(self, if app.cert_store.verify(tls_certificate, tls_errors): return + phrase = '' for error in tls_errors: phrase = get_tls_error_phrase(error) self._log.warning('TLS verification failed: %s', phrase) @@ -273,7 +274,6 @@ def _on_finish(self, self._log.info('Upload completed successfully') transfer.set_finished() - else: phrase = Soup.Status.get_phrase(message.props.status_code) self._log.error('Got unexpected http upload response code: %s', @@ -416,7 +416,7 @@ def _close(self) -> None: def get_chunk(self) -> Optional[bytes]: if self._stream is None: if self._encryption is None: - self._stream = open(self._path, 'rb') # pylint: disable=consider-using-with + self._stream = open(self._path, 'rb') # pylint: disable=consider-using-with # noqa: E501 else: self._stream = io.BytesIO(self._data) ===================================== gajim/common/modules/ibb.py ===================================== @@ -97,7 +97,7 @@ def _ibb_received(self, file_props.disconnect_cb = None file_props.continue_cb = None file_props.syn_id = stanza.getID() - file_props.fp = open(file_props.file_name, 'wb') # pylint: disable=consider-using-with + file_props.fp = open(file_props.file_name, 'wb') # pylint: disable=consider-using-with # noqa: E501 self.send_reply(stanza) elif properties.ibb.type == 'close': ===================================== gajim/common/modules/jingle.py ===================================== @@ -16,7 +16,7 @@ Handles the jingle signalling protocol """ -#TODO: +# TODO: # * things in XEP 0176, including: # - http://xmpp.org/extensions/xep-0176.html#protocol-restarts # - http://xmpp.org/extensions/xep-0176.html#fallback @@ -94,7 +94,7 @@ def delete_jingle_session(self, sid: str) -> None: Remove a jingle session from a jingle stanza dispatcher """ if sid in self._sessions: - #FIXME: Move this elsewhere? + # FIXME: Move this elsewhere? for content in list(self._sessions[sid].contents.values()): content.destroy() self._sessions[sid].callbacks = [] @@ -159,7 +159,7 @@ def _on_jingle_iq(self, # do we need to create a new jingle object if sid not in self._sessions: - #TODO: tie-breaking and other things... + # TODO: tie-breaking and other things... newjingle = JingleSession(self._con, weinitiate=False, jid=jid, iq_id=id_, sid=sid) self._sessions[sid] = newjingle @@ -313,8 +313,8 @@ def get_file_info(self, _account: Optional[str] = None ) -> Optional[dict[str, Any]]: if hash_: - for file in self.files: # DEBUG - #if f['hash'] == '1294809248109223': + for file in self.files: # DEBUG + # if f['hash'] == '1294809248109223': if file['hash'] == hash_ and file['peerjid'] == peerjid: return file elif name: ===================================== gajim/common/modules/misc.py ===================================== @@ -25,6 +25,7 @@ log = logging.getLogger('gajim.c.m.misc') + # XEP-0066: Out of Band Data def parse_oob(properties: MessageProperties, additional_data: AdditionalDataDict ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -31,6 +31,7 @@ from gajim.common.modules.util import event_node from gajim.common.modules.util import as_task + class UserAvatar(BaseModule): _nbxmpp_extends = 'UserAvatar' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/246e509049b365076f55547d8f8b090f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/246e509049b365076f55547d8f8b090f… 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