Commits June 2020

commits@gajim.org

1 participants
55 discussions

[Git][gajim/gajim][master] Client: Update presence of MUCs only on resume
by Philipp Hörist 02 Jun '20

02 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 098a2d10 by lovetox at 2020-06-02T15:01:09+02:00 Client: Update presence of MUCs only on resume - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -403,7 +403,7 @@ class Client(ConnectionHandlers): self.update_presence() - def update_presence(self): + def update_presence(self, include_muc=True): status, message, idle = self.get_presence_state() self._priority = app.get_priority(self._account, status) self.get_module('Presence').send_presence( @@ -412,7 +412,8 @@ class Client(ConnectionHandlers): status=message, idle_time=idle) - self.get_module('MUC').update_presence() + if include_muc: + self.get_module('MUC').update_presence() def get_module(self, name): return modules.get(self._account, name) @@ -427,12 +428,14 @@ class Client(ConnectionHandlers): elif self._connect_machine_calls == 3: self.get_module('Roster').request_roster() elif self._connect_machine_calls == 4: - self._send_first_presence() + self._finish_connect() - def _send_first_presence(self): + def _finish_connect(self): self._status_sync_on_resume = False self._set_client_available() - self.update_presence() + + # We did not resume the stream, so we are not joined any MUCs + self.update_presence(include_muc=False) if not self.avatar_conversion: # ask our VCard View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/098a2d10621d36fe1bd52b2b22670b72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/098a2d10621d36fe1bd52b2b22670b72… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused helper methods
by Philipp Hörist 02 Jun '20

02 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3989b66c by lovetox at 2020-06-02T12:47:57+02:00 Remove unused helper methods - - - - - 03cb4723 by lovetox at 2020-06-02T13:06:04+02:00 Fix pylint errors - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -34,8 +34,6 @@ import re import os import subprocess import webbrowser -import errno -import select import base64 import hashlib import shlex @@ -55,7 +53,6 @@ from string import Template import urllib from urllib.parse import unquote from io import StringIO -from datetime import datetime, timedelta from encodings.punycode import punycode_encode from functools import wraps from packaging.version import Version as V @@ -93,7 +90,10 @@ if app.is_installed('PYCURL'): log = logging.getLogger('gajim.c.helpers') -special_groups = (_('Transports'), _('Not in contact list'), _('Observers'), _('Group chats')) +special_groups = (_('Transports'), + _('Not in contact list'), + _('Observers'), + _('Group chats')) URL_REGEX = re.compile( r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") @@ -152,25 +152,18 @@ def parse_resource(resource): """ Perform stringprep on resource and return it """ - if resource: - try: - return resource.encode('OpaqueString').decode('utf-8') - except UnicodeError: - raise InvalidFormat('Invalid character in resource.') + if not resource: + return None -def windowsify(s): - if os.name == 'nt': - return s.capitalize() - return s + try: + return resource.encode('OpaqueString').decode('utf-8') + except UnicodeError: + raise InvalidFormat('Invalid character in resource.') -def temp_failure_retry(func, *args, **kwargs): - while True: - try: - return func(*args, **kwargs) - except (os.error, IOError, select.error) as ex: - if ex.errno == errno.EINTR: - continue - raise +def windowsify(word): + if os.name == 'nt': + return word.capitalize() + return word def get_uf_show(show, use_mnemonic=False): """ @@ -223,7 +216,6 @@ def get_uf_show(show, use_mnemonic=False): uf_show = Q_('?contact has status:Has errors') return uf_show - def get_uf_sub(sub): if sub == 'none': uf_sub = Q_('?Subscription we already have:None') @@ -352,8 +344,8 @@ def exec_command(command, use_shell=False, posix=True): subprocess.Popen('%s &' % command, shell=True).wait() else: args = shlex.split(command, posix=posix) - p = subprocess.Popen(args) - app.thread_interface(p.wait) + process = subprocess.Popen(args) + app.thread_interface(process.wait) def build_command(executable, parameter): # we add to the parameter (can hold path with spaces) @@ -426,42 +418,6 @@ def get_account_status(account): status = reduce_chars_newlines(account['status_line'], 100, 1) return status -def datetime_tuple(timestamp): - """ - Convert timestamp using strptime and the format: %Y%m%dT%H:%M:%S - - Because of various datetime formats are used the following exceptions - are handled: - - Optional milliseconds appended to the string are removed - - Optional Z (that means UTC) appended to the string are removed - - XEP-082 datetime strings have all '-' chars removed to meet - the above format. - """ - date, tim = timestamp.split('T', 1) - date = date.replace('-', '') - tim = tim.replace('z', '') - tim = tim.replace('Z', '') - zone = None - if '+' in tim: - sign = -1 - tim, zone = tim.split('+', 1) - if '-' in tim: - sign = 1 - tim, zone = tim.split('-', 1) - tim = tim.split('.')[0] - tim = time.strptime(date + 'T' + tim, '%Y%m%dT%H:%M:%S') - if zone: - zone = zone.replace(':', '') - tim = datetime.fromtimestamp(time.mktime(tim)) - if len(zone) > 2: - zone = time.strptime(zone, '%H%M') - else: - zone = time.strptime(zone, '%H') - zone = timedelta(hours=zone.tm_hour, minutes=zone.tm_min) - tim += zone * sign - tim = tim.timetuple() - return tim - def get_contact_dict_for_account(account): """ Create a dict of jid, nick -> contact with all contacts of account. @@ -470,8 +426,7 @@ def get_contact_dict_for_account(account): """ contacts_dict = {} for jid in app.contacts.get_jid_list(account): - contact = app.contacts.get_contact_with_highest_priority(account, - jid) + contact = app.contacts.get_contact_with_highest_priority(account, jid) contacts_dict[jid] = contact name = contact.name if name in contacts_dict: @@ -509,22 +464,25 @@ def check_soundfile_path(file_, dirs=None): if os.path.exists(file_): return file_ - for d in dirs: - d = os.path.join(d, 'sounds', file_) - if os.path.exists(d): - return d + for dir_ in dirs: + dir_ = os.path.join(dir_, 'sounds', file_) + if os.path.exists(dir_): + return dir_ return None def strip_soundfile_path(file_, dirs=None, abs_=True): """ Remove knowns paths from a sound file - Filechooser returns absolute path. If path is a known fallback path, we remove it. - So config have no hardcoded path to DATA_DIR and text in textfield is shorther. - param: file_: the filename to strip. - param: dirs: list of knowns paths from which the filename should be stripped. - param: abs_: force absolute path on dirs + Filechooser returns an absolute path. + If path is a known fallback path, we remove it. + So config has no hardcoded path to DATA_DIR and text in textfield is + shorther. + param: file_: the filename to strip + param: dirs: list of knowns paths from which the filename should be stripped + param: abs_: force absolute path on dirs """ + if not file_: return None @@ -533,11 +491,11 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): configpaths.get('DATA')] name = os.path.basename(file_) - for d in dirs: - d = os.path.join(d, 'sounds', name) + for dir_ in dirs: + dir_ = os.path.join(dir_, 'sounds', name) if abs_: - d = os.path.abspath(d) - if file_ == d: + dir_ = os.path.abspath(dir_) + if file_ == dir_: return name return file_ @@ -629,8 +587,8 @@ def get_icon_name_to_show(contact, account=None): """ if account and app.events.get_nb_roster_events(account, contact.jid): return 'event' - if account and app.events.get_nb_roster_events( - account, contact.get_full_jid()): + if account and app.events.get_nb_roster_events(account, + contact.get_full_jid()): return 'event' if account and account in app.interface.minimized_controls and \ contact.jid in app.interface.minimized_controls[account] and app.interface.\ @@ -704,8 +662,9 @@ def get_os_info(): info = platform.system() return info -def allow_showing_notification(account, type_='notify_on_new_message', -is_first_message=True): +def allow_showing_notification(account, + type_='notify_on_new_message', + is_first_message=True): """ Is it allowed to show nofication? @@ -715,9 +674,9 @@ is_first_message=True): """ if type_ and (not app.config.get(type_) or not is_first_message): return False - if app.config.get('autopopupaway'): # always show notification + if app.config.get('autopopupaway'): return True - if app.connections[account].status in ('online', 'chat'): # we're online or chat + if app.connections[account].status in ('online', 'chat'): return True return False @@ -728,7 +687,7 @@ def allow_popup_window(account): autopopup = app.config.get('autopopup') autopopupaway = app.config.get('autopopupaway') if autopopup and (autopopupaway or \ - app.connections[account].status in ('online', 'chat')): # we're online or chat + app.connections[account].status in ('online', 'chat')): return True return False @@ -739,35 +698,12 @@ def allow_sound_notification(account, sound_event): return True return False -def get_chat_control(account, contact): - full_jid_with_resource = contact.jid - if contact.resource: - full_jid_with_resource += '/' + contact.resource - highest_contact = app.contacts.get_contact_with_highest_priority( - account, contact.jid) - - # Look for a chat control that has the given resource, or default to - # one without resource - ctrl = app.interface.msg_win_mgr.get_control(full_jid_with_resource, - account) - - if ctrl: - return ctrl - - if (highest_contact and - highest_contact.resource and - contact.resource != highest_contact.resource): - return None - - # unknown contact or offline message - return app.interface.msg_win_mgr.get_control(contact.jid, account) - def get_notification_icon_tooltip_dict(): """ Return a dict of the form {acct: {'show': show, 'message': message, 'event_lines': [list of text lines to show in tooltip]} """ - # How many events must there be before they're shown summarized, not per-user + # How many events before we show summarized, not per-user max_ungrouped_events = 10 accounts = get_accounts_info() @@ -778,7 +714,8 @@ def get_notification_icon_tooltip_dict(): account['event_lines'] = [] # Gather events per-account pending_events = app.events.get_events(account=account_name) - messages, non_messages, total_messages, total_non_messages = {}, {}, 0, 0 + messages, non_messages = {}, {} + total_messages, total_non_messages = 0, 0 for jid in pending_events: for event in pending_events[jid]: if event.type_.count('file') > 0: @@ -792,19 +729,21 @@ def get_notification_icon_tooltip_dict(): # Display unread messages numbers, if any if total_messages > 0: if total_messages > max_ungrouped_events: - text = ngettext( - '%d message pending', - '%d messages pending', - total_messages, total_messages, total_messages) + text = ngettext('%d message pending', + '%d messages pending', + total_messages, + total_messages, + total_messages) account['event_lines'].append(text) else: for jid in messages: - text = ngettext( - '%d message pending', - '%d messages pending', - messages[jid], messages[jid], messages[jid]) + text = ngettext('%d message pending', + '%d messages pending', + messages[jid], + messages[jid], + messages[jid]) contact = app.contacts.get_first_contact_from_jid( - account['name'], jid) + account['name'], jid) text += ' ' if jid in app.gc_connected[account['name']]: text += _('from group chat %s') % (jid) @@ -818,64 +757,24 @@ def get_notification_icon_tooltip_dict(): # Display unseen events numbers, if any if total_non_messages > 0: if total_non_messages > max_ungrouped_events: - text = ngettext( - '%d event pending', - '%d events pending', - total_non_messages, total_non_messages, total_non_messages) + text = ngettext('%d event pending', + '%d events pending', + total_non_messages, + total_non_messages, + total_non_messages) account['event_lines'].append(text) else: for jid in non_messages: - text = ngettext('%d event pending', '%d events pending', - non_messages[jid], non_messages[jid], non_messages[jid]) + text = ngettext('%d event pending', + '%d events pending', + non_messages[jid], + non_messages[jid], + non_messages[jid]) text += ' ' + _('from user %s') % (jid) account[account]['event_lines'].append(text) return accounts -def get_notification_icon_tooltip_text(): - text = None - # How many events must there be before they're shown summarized, not per-user - # max_ungrouped_events = 10 - # Character which should be used to indent in the tooltip. - indent_with = ' ' - - accounts = get_notification_icon_tooltip_dict() - - if not accounts: - # No configured account - return _('Gajim') - - # at least one account present - - # Is there more that one account? - if len(accounts) == 1: - show_more_accounts = False - else: - show_more_accounts = True - - # If there is only one account, its status is shown on the first line. - if show_more_accounts: - text = _('Gajim') - else: - text = _('Gajim - %s') % (get_account_status(accounts[0])) - - # Gather and display events. (With accounts, when there are more.) - for account in accounts: - account_name = account['name'] - # Set account status, if not set above - if show_more_accounts: - message = '\n' + indent_with + ' %s - %s' - text += message % (account_name, get_account_status(account)) - # Account list shown, messages need to be indented more - indent_how = 2 - else: - # If no account list is shown, messages could have default indenting. - indent_how = 1 - for line in account['event_lines']: - text += '\n' + indent_with * indent_how + ' ' - text += line - return text - def get_accounts_info(): """ Helper for notification icon tooltip @@ -959,20 +858,6 @@ def get_subscription_request_msg(account=None): s = Template(s).safe_substitute({'name': name}) return s -def replace_dataform_media(form, stanza): - found = False - for field in form.getTags('field'): - for media in field.getTags('media'): - for uri in media.getTags('uri'): - uri_data = uri.getData() - if uri_data.startswith('cid:'): - uri_data = uri_data[4:] - for data in stanza.getTags('data', namespace=Namespace.BOB): - if data.getAttr('cid') == uri_data: - uri.setData(data.getData()) - found = True - return found - def get_user_proxy(account): proxy_name = app.config.get_per('accounts', account, 'proxy') if not proxy_name: @@ -1030,7 +915,9 @@ def _get_img_direct(attrs): f.fp._sock.fp._sock.settimeout(2) except Exception: pass - # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + + # On a slow internet connection with ~1000kbps + # you need ~10 seconds for 1 MB deadline = time.time() + (10 * (max_size / 1048576)) while True: if time.time() > deadline: @@ -1080,7 +967,9 @@ def _get_img_proxy(attrs, proxy): c.setopt(pycurl.FOLLOWLOCATION, 1) # Wait maximum 10s for connection c.setopt(pycurl.CONNECTTIMEOUT, 10) - # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + + # On a slow internet connection with ~1000kbps + # you need ~10 seconds for 1 MB c.setopt(pycurl.TIMEOUT, 10 * (max_size / 1048576)) c.setopt(pycurl.MAXFILESIZE, max_size) c.setopt(pycurl.WRITEFUNCTION, b.write) @@ -1504,6 +1393,7 @@ def get_alternative_venue(error): uri = parse_uri(error.condition_data) if uri.type == URIType.XMPP and uri.action == URIAction.JOIN: return uri.data['jid'] + return None def is_affiliation_change_allowed(self_contact, contact, target_aff): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/557334a60ddf0530937ef11c838abb1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/557334a60ddf0530937ef11c838abb1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused code
by Philipp Hörist 02 Jun '20

02 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a75c42f6 by lovetox at 2020-06-02T10:47:14+02:00 Remove unused code - - - - - 557334a6 by lovetox at 2020-06-02T10:55:49+02:00 Menu: Better name start chat entry - - - - - 4 changed files: - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/data/gui/application_menu.ui - gajim/gui_interface.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== @@ -28,12 +28,9 @@ import logging import operator import nbxmpp -from nbxmpp.namespaces import Namespace from gajim.common import app -from gajim.common.connection_handlers_events import StreamReceivedEvent from gajim.common.connection_handlers_events import PresenceReceivedEvent -from gajim.common.connection_handlers_events import StreamConflictReceivedEvent from gajim.common.connection_handlers_events import NotificationEvent @@ -181,17 +178,4 @@ class ConnectionHandlers(ConnectionHandlersBase): ConnectionHandlersBase.__init__(self) app.nec.register_incoming_event(PresenceReceivedEvent) - app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(NotificationEvent) - - def _StreamCB(self, con, obj): - log.debug('StreamCB') - app.nec.push_incoming_event(StreamReceivedEvent(None, - conn=self, stanza=obj)) - - def _register_handlers(self, con, con_type): - # try to find another way to register handlers in each class - # that defines handlers - - con.RegisterHandler('unknown', self._StreamCB, - Namespace.XMPP_STREAMS, xmlns=Namespace.STREAMS) ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -19,7 +19,6 @@ import logging -import OpenSSL.crypto from nbxmpp.namespaces import Namespace from gajim.common import nec @@ -27,7 +26,6 @@ from gajim.common import helpers from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ -from gajim.common.const import SSLError from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp @@ -35,18 +33,6 @@ from gajim.common.file_props import FilesProp log = logging.getLogger('gajim.c.connection_handlers_events') -class StreamReceivedEvent(nec.NetworkIncomingEvent): - name = 'stream-received' - -class StreamConflictReceivedEvent(nec.NetworkIncomingEvent): - name = 'stream-conflict-received' - base_network_events = ['stream-received'] - - def generate(self): - if self.base_event.stanza.getTag('conflict'): - self.conn = self.base_event.conn - return True - class PresenceReceivedEvent(nec.NetworkIncomingEvent): name = 'presence-received' @@ -59,32 +45,6 @@ class OurShowEvent(nec.NetworkIncomingEvent): class MessageSentEvent(nec.NetworkIncomingEvent): name = 'message-sent' -class NewAccountConnectedEvent(nec.NetworkIncomingEvent): - name = 'new-account-connected' - - def generate(self): - try: - self.errnum = self.conn.connection.Connection.ssl_errnum - except AttributeError: - self.errnum = 0 # we don't have an errnum - self.ssl_msg = '' - if self.errnum > 0: - self.ssl_msg = SSLError.get(self.errnum, - _('Unknown SSL error: %d') % self.errnum) - self.ssl_cert = '' - self.ssl_fingerprint_sha1 = '' - self.ssl_fingerprint_sha256 = '' - if self.conn.connection.Connection.ssl_certificate: - cert = self.conn.connection.Connection.ssl_certificate - self.ssl_cert = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') - self.ssl_fingerprint_sha1 = cert.digest('sha1').decode('utf-8') - self.ssl_fingerprint_sha256 = cert.digest('sha256').decode('utf-8') - return True - -class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): - name = 'new-account-not-connected' - class ConnectionLostEvent(nec.NetworkIncomingEvent): name = 'connection-lost' ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -5,7 +5,7 @@ <attribute name="label">_Gajim</attribute> <section> <item> - <attribute name="label" translatable="yes">_Start Chat…</attribute> + <attribute name="label" translatable="yes">_Start / Join Chat…</attribute> <attribute name="action">app.start-chat</attribute> <attribute name="target"></attribute> </item> ===================================== gajim/gui_interface.py ===================================== @@ -217,26 +217,6 @@ class Interface: self.unblock_signed_in_notifications, event.account) - @staticmethod - def handle_gc_error(gc_control, pritext, sectext): - if gc_control and gc_control.autorejoin is not None: - if gc_control.error_dialog: - gc_control.error_dialog.destroy() - def on_close(dummy): - gc_control.error_dialog.destroy() - gc_control.error_dialog = None - gc_control.error_dialog = ErrorDialog(pritext, sectext, - on_response_ok=on_close, on_response_cancel=on_close) - gc_control.error_dialog.set_modal(False) - if gc_control.parent_win: - gc_control.error_dialog.set_transient_for( - gc_control.parent_win.window) - else: - d = ErrorDialog(pritext, sectext) - if gc_control and gc_control.parent_win: - d.set_transient_for(gc_control.parent_win.window) - d.set_modal(False) - def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource, # priority, timestamp)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f8e137fa6df31e456190d93ae6e7583… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f8e137fa6df31e456190d93ae6e7583… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Client: Remove unnecessary our-show events
by Philipp Hörist 02 Jun '20

02 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 995b0172 by lovetox at 2020-06-02T08:29:01+02:00 Client: Remove unnecessary our-show events The event gets raised when we receive the presence reflection - - - - - fbe8c156 by lovetox at 2020-06-02T08:33:23+02:00 Client: Use NetworkEvent instead of OurShowEvent - - - - - 3f6edc15 by lovetox at 2020-06-02T09:45:26+02:00 Refactor our-show event handlers - - - - - e24f63c3 by lovetox at 2020-06-02T09:49:55+02:00 Remove unused code - - - - - f8e137fa by lovetox at 2020-06-02T10:34:01+02:00 Update pre-push-tests.sh - - - - - 9 changed files: - gajim/chat_control_base.py - gajim/common/client.py - gajim/common/modules/presence.py - gajim/groupchat_control.py - gajim/gtk/notification.py - gajim/gui_interface.py - gajim/remote_control.py - gajim/roster_window.py - scripts/dev/pre-push-tests.sh Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -42,6 +42,7 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.nec import EventHelper from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import event_filter from gajim.common.contacts import GC_Contact from gajim.common.const import Chatstate from gajim.common.structs import OutgoingMessage @@ -434,14 +435,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.session.control = None self.session = None - def _nec_our_status(self, obj): - if self.account != obj.conn.name: + @event_filter(['account']) + def _nec_our_status(self, event): + if event.show == 'connecting': return - if obj.show == 'connecting': - return - - if obj.show == 'offline': + if event.show == 'offline': self.got_disconnected() else: self.got_connected() ===================================== gajim/common/client.py ===================================== @@ -40,7 +40,6 @@ from gajim.common.idle import Monitor from gajim.common.i18n import _ from gajim.common.connection_handlers import ConnectionHandlers -from gajim.common.connection_handlers_events import OurShowEvent from gajim.common.connection_handlers_events import MessageSentEvent from gajim.gtk.util import open_window @@ -216,8 +215,8 @@ class Client(ConnectionHandlers): def _on_resume_failed(self, _client, _signal_name): log.info('Resume failed') - app.nec.push_incoming_event(OurShowEvent( - None, conn=self, show='offline')) + app.nec.push_incoming_event(NetworkEvent( + 'our-show', account=self._account, show='offline')) self.get_module('Chatstate').enabled = False def _on_resume_successful(self, _client, _signal_name): @@ -227,9 +226,6 @@ class Client(ConnectionHandlers): if self._status_sync_on_resume: self._status_sync_on_resume = False self.update_presence() - else: - app.nec.push_incoming_event( - OurShowEvent(None, conn=self, show=self._status)) def _set_client_available(self): self._set_state(ClientState.AVAILABLE) @@ -263,8 +259,8 @@ class Client(ConnectionHandlers): self.get_module('Chatstate').enabled = False self._reconnect = False self._after_disconnect() - app.nec.push_incoming_event(OurShowEvent( - None, conn=self, show='offline')) + app.nec.push_incoming_event(NetworkEvent( + 'our-show', account=self._account, show='offline')) self.process_ssl_errors() elif domain in (StreamError.STREAM, StreamError.BIND): @@ -296,12 +292,12 @@ class Client(ConnectionHandlers): self._after_disconnect() self._schedule_reconnect() app.nec.push_incoming_event( - OurShowEvent(None, conn=self, show='error')) + NetworkEvent('our-show', account=self._account, show='error')) else: self.get_module('Chatstate').enabled = False - app.nec.push_incoming_event(OurShowEvent( - None, conn=self, show='offline')) + app.nec.push_incoming_event(NetworkEvent( + 'our-show', account=self._account, show='offline')) self._after_disconnect() def _after_disconnect(self): @@ -418,9 +414,6 @@ class Client(ConnectionHandlers): self.get_module('MUC').update_presence() - app.nec.push_incoming_event( - OurShowEvent(None, conn=self, show=status)) - def get_module(self, name): return modules.get(self._account, name) @@ -542,7 +535,7 @@ class Client(ConnectionHandlers): self._set_state(ClientState.DISCONNECTED) self._disable_reconnect_timer() app.nec.push_incoming_event( - OurShowEvent(None, conn=self, show='offline')) + NetworkEvent('our-show', account=self._account, show='offline')) if self._destroy_client: self._client.destroy() ===================================== gajim/common/modules/presence.py ===================================== @@ -90,7 +90,7 @@ class Presence(BaseModule): if properties.is_self_presence: app.nec.push_incoming_event( NetworkEvent('our-show', - conn=self._con, + account=self._account, show=properties.show.value)) return ===================================== gajim/groupchat_control.py ===================================== @@ -1128,12 +1128,11 @@ class GroupchatControl(ChatControlBase): msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) + @event_filter(['account']) def _nec_our_status(self, event): - if self.account != event.conn.name: - return - + client = app.get_client(event.account) if (event.show == 'offline' and - not event.conn.state.is_reconnect_scheduled): + not client.state.is_reconnect_scheduled): self.got_disconnected() if self.parent_win: ===================================== gajim/gtk/notification.py ===================================== @@ -132,9 +132,9 @@ class Notification(EventHelper): 'printed_gc_msg'): self._withdraw('new-message', event.account, event.jid) - def _nec_our_status(self, obj): - if app.account_is_connected(obj.conn.name): - self._withdraw('connection-failed', obj.conn.name) + def _nec_our_status(self, event): + if app.account_is_connected(event.account): + self._withdraw('connection-failed', event.account) @staticmethod def _get_icon_name(obj): ===================================== gajim/gui_interface.py ===================================== @@ -201,28 +201,21 @@ class Interface: def unblock_signed_in_notifications(account): app.block_signed_in_notifications[account] = False - def handle_event_status(self, obj): # OUR status - #('STATUS', account, show) - account = obj.conn.name - if obj.show in ('offline', 'error'): + def handle_event_status(self, event): + if event.show in ('offline', 'error'): # TODO: Close all account windows pass - if obj.show == 'offline': - app.block_signed_in_notifications[account] = True + if event.show == 'offline': + app.block_signed_in_notifications[event.account] = True else: # 30 seconds after we change our status to sth else than offline # we stop blocking notifications of any kind # this prevents from getting the roster items as 'just signed in' # contacts. 30 seconds should be enough time - GLib.timeout_add_seconds(30, self.unblock_signed_in_notifications, - account) - - if account in self.show_vcard_when_connect and obj.show not in ( - 'offline', 'error'): - action = '%s-profile' % account - app.app.activate_action(action, GLib.Variant('s', account)) - self.show_vcard_when_connect.remove(account) + GLib.timeout_add_seconds(30, + self.unblock_signed_in_notifications, + event.account) @staticmethod def handle_gc_error(gc_control, pritext, sectext): @@ -2026,8 +2019,6 @@ class Interface: logind.enable() music_track.enable() - self.show_vcard_when_connect = [] - idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, app.config.get('autoxatime') * 60) ===================================== gajim/remote_control.py ===================================== @@ -382,8 +382,8 @@ class GajimRemote(Server): event_type, obj.properties.subject, obj.msg_log_id, obj.properties.nickname])) - def on_our_status(self, obj): - self.raise_signal('AccountPresence', (obj.show, obj.conn.name)) + def on_our_status(self, event): + self.raise_signal('AccountPresence', (event.show, event.account)) def on_account_created(self, obj): self.raise_signal('NewAccount', (obj.conn.name, obj.account_info)) ===================================== gajim/roster_window.py ===================================== @@ -2568,19 +2568,19 @@ class RosterWindow: """ self.rename_self_contact(obj.old_jid, obj.new_jid, obj.conn.name) - def _nec_our_show(self, obj): + def _nec_our_show(self, event): model = self.status_combobox.get_model() iter_ = model.get_iter_from_string('6') - if obj.show == 'offline': + if event.show == 'offline': # sensitivity for this menuitem if app.get_number_of_connected_accounts() == 0: model[iter_][3] = False - self.application.set_account_actions_state(obj.conn.name) + self.application.set_account_actions_state(event.account) self.application.update_app_actions_state() else: # sensitivity for this menuitem model[iter_][3] = True - self.on_status_changed(obj.conn.name, obj.show) + self.on_status_changed(event.account, event.show) def _nec_connection_type(self, obj): self.draw_account(obj.conn.name) ===================================== scripts/dev/pre-push-tests.sh ===================================== @@ -1,4 +1,15 @@ -SCRIPTDIR=$(dirname $0) +#!/bin/sh +# exit when any command fails +set -e + +GREEN='\033[0;32m' + + +./scripts/dev/pylint-ci.sh gajim +echo "${GREEN}pylint: \t OK" mypy gajim -${SCRIPTDIR}/pylint-ci.sh --jobs=0 gajim +echo "${GREEN}mypy: \t\t OK" +codespell -I codespell.conf --skip="*__pycache__*,gajim/data/icons,gajim/data/sounds,gajim/data/emoticons" gajim +echo "${GREEN}codespell: \t OK" +echo "${GREEN}ready to push" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d572b3c529761794b6b01c50debdb02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d572b3c529761794b6b01c50debdb02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Client: Update status while disconnected
by Philipp Hörist 02 Jun '20

02 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d572b3c5 by lovetox at 2020-06-02T08:16:52+02:00 Client: Update status while disconnected Idle status changes while disconnected were lost leading to reconnecting or resuming with the idle status we had before disconnect - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -69,6 +69,7 @@ class Client(ConnectionHandlers): self.roster_supported = True self._state = ClientState.DISCONNECTED + self._status_sync_on_resume = False self._status = 'online' self._status_message = '' self._idle_status = 'online' @@ -223,14 +224,18 @@ class Client(ConnectionHandlers): self._set_state(ClientState.CONNECTED) self._set_client_available() + if self._status_sync_on_resume: + self._status_sync_on_resume = False + self.update_presence() + else: + app.nec.push_incoming_event( + OurShowEvent(None, conn=self, show=self._status)) + def _set_client_available(self): self._set_state(ClientState.AVAILABLE) app.nec.push_incoming_event(NetworkEvent('account-connected', account=self._account)) - app.nec.push_incoming_event( - OurShowEvent(None, conn=self, show=self._status)) - def disconnect(self, gracefully, reconnect, destroy_client=False): if self._state.is_disconnecting: log.warning('Disconnect already in progress') @@ -432,17 +437,9 @@ class Client(ConnectionHandlers): self._send_first_presence() def _send_first_presence(self): - self._priority = app.get_priority(self._account, self._status) - - self._status, message, idle = self.get_presence_state() - - self.get_module('Presence').send_presence( - priority=self._priority, - show=self._status, - status=message, - idle_time=idle) - + self._status_sync_on_resume = False self._set_client_available() + self.update_presence() if not self.avatar_conversion: # ask our VCard @@ -564,9 +561,7 @@ class Client(ConnectionHandlers): if monitor.is_awake(): self._idle_status = state self._idle_status_message = '' - if self._state.is_available and self._idle_status_enabled: - self._status = state - self.update_presence() + self._update_status() return if not app.config.get(f'auto{state}'): @@ -578,9 +573,17 @@ class Client(ConnectionHandlers): self._idle_status = state self._idle_status_message = get_idle_status_message( state, self._status_message) - if self._state.is_available and self._idle_status_enabled: - self._status = state - self.update_presence() + self._update_status() + + def _update_status(self): + if not self._idle_status_enabled: + return + + self._status = self._idle_status + if self._state.is_available: + self.update_presence() + else: + self._status_sync_on_resume = True def _idle_status_active(self): if not Monitor.is_available(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d572b3c529761794b6b01c50debdb02c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d572b3c529761794b6b01c50debdb02c… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2020