Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 5 commits: Accounts: Move changing config setting to gui_interface
by Philipp Hörist 07 Dec '19

07 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 77613c22 by Philipp Hörist at 2019-12-07T12:14:58Z Accounts: Move changing config setting to gui_interface - - - - - 71197932 by Philipp Hörist at 2019-12-07T12:14:58Z Simplify remove_account() Use disable_account() before removing - - - - - c986abcd by Philipp Hörist at 2019-12-07T12:14:58Z Extend get_connected_accounts() Add option to exclude Local account from the result - - - - - b022f883 by Philipp Hörist at 2019-12-07T12:14:58Z Update the state of app actions This allows us to update certain actions, e.g. when no account is connected - - - - - 9f5b83e0 by Philipp Hörist at 2019-12-07T12:14:58Z CreateGroupchat: Show only connected accounts - - - - - 6 changed files: - gajim/application.py - gajim/common/app.py - gajim/gtk/accounts.py - gajim/gtk/groupchat_creation.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/application.py ===================================== @@ -239,6 +239,7 @@ class GajimApplication(Gtk.Application): self._set_shortcuts() from gajim import gui_menu_builder gui_menu_builder.build_accounts_menu() + self.update_app_actions_state() app.ged.register_event_handler('feature-discovered', ged.CORE, @@ -535,6 +536,13 @@ class GajimApplication(Gtk.Application): # We go online self.lookup_action(account + action_name).set_enabled(True) + def update_app_actions_state(self): + active_accounts = bool(app.get_connected_accounts(exclude_local=True)) + self.lookup_action('create-groupchat').set_enabled(active_accounts) + + enabled_accounts = app.contacts.get_accounts() + self.lookup_action('start-chat').set_enabled(enabled_accounts) + def _set_shortcuts(self): shortcuts = { 'app.quit': ['<Primary>Q'], ===================================== gajim/common/app.py ===================================== @@ -415,12 +415,14 @@ def get_number_of_connected_accounts(accounts_list=None): connected_accounts = connected_accounts + 1 return connected_accounts -def get_connected_accounts(): +def get_connected_accounts(exclude_local=False): """ Returns a list of CONNECTED accounts """ account_list = [] for account in connections: + if account == 'Local' and exclude_local: + continue if account_is_connected(account): account_list.append(account) return account_list ===================================== gajim/gtk/accounts.py ===================================== @@ -521,7 +521,6 @@ class AccountRow(Gtk.ListBoxRow): app.connections[account].change_status('offline', 'offline') app.connections[account].disconnect(reconnect=False) app.interface.disable_account(account) - app.config.set_per('accounts', account, 'active', False) switch.set_state(state) old_state = app.config.get_per('accounts', account, 'active') @@ -547,7 +546,6 @@ class AccountRow(Gtk.ListBoxRow): app.interface.enable_account(account) else: app.interface.disable_account(account) - app.config.set_per('accounts', account, 'active', state) return Gdk.EVENT_PROPAGATE ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -62,7 +62,7 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): self.set_focus(self._ui.address_entry) def _fill_account_combo(self, account): - accounts = app.get_enabled_accounts_with_labels() + accounts = app.get_enabled_accounts_with_labels(connected_only=True) account_liststore = self._ui.account_combo.get_model() for acc in accounts: account_liststore.append(acc) ===================================== gajim/gui_interface.py ===================================== @@ -1762,6 +1762,8 @@ class Interface: self.roster.setup_and_draw_roster() gui_menu_builder.build_accounts_menu() self.roster.send_status(account, 'online', '') + app.config.set_per('accounts', account, 'active', True) + app.app.update_app_actions_state() def disable_account(self, account): self.roster.close_all(account, force=True) @@ -1796,42 +1798,21 @@ class Interface: 'accounts', account, 'roster_version', '') self.roster.setup_and_draw_roster() gui_menu_builder.build_accounts_menu() + app.config.set_per('accounts', account, 'active', False) + app.app.update_app_actions_state() def remove_account(self, account): - # Close all opened windows - self.roster.close_all(account, force=True) if account in app.connections: app.connections[account].disconnect(reconnect=False) - app.connections[account].cleanup() - del app.connections[account] + + self.disable_account(account) + app.logger.remove_roster(app.get_jid_from_account(account)) # Delete password must be before del_per() because it calls set_per() # which would recreate the account with defaults values if not found passwords.delete_password(account) app.config.del_per('accounts', account) - del self.instances[account] - if account in app.nicks: - del self.minimized_controls[account] - del app.nicks[account] - del app.block_signed_in_notifications[account] - del app.groups[account] - app.contacts.remove_account(account) - del app.gc_connected[account] - del app.automatic_rooms[account] - del app.to_be_removed[account] - del app.newly_added[account] - del app.sleeper_state[account] - del app.last_message_time[account] - del app.status_before_autoaway[account] - del app.gajim_optional_features[account] - del app.caps_hash[account] - if len(app.connections) >= 2: # Do not merge accounts if only one exists - self.roster.regroup = app.config.get('mergeaccounts') - else: - self.roster.regroup = False - self.roster.setup_and_draw_roster() app.app.remove_account_actions(account) - gui_menu_builder.build_accounts_menu() window = get_app_window('AccountsWindow') if window is not None: ===================================== gajim/roster_window.py ===================================== @@ -2597,6 +2597,7 @@ class RosterWindow: if app.get_number_of_connected_accounts() == 0: model[iter_][3] = False self.application.set_account_actions_state(obj.conn.name) + self.application.update_app_actions_state() else: # sensitivity for this menuitem model[iter_][3] = True @@ -2652,6 +2653,7 @@ class RosterWindow: def _nec_signed_in(self, obj): self.application.set_account_actions_state(obj.conn.name, True) + self.application.update_app_actions_state() self.draw_account(obj.conn.name) def _nec_decrypted_message_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/eef27894bff0235be3598b3bd9c14ca6d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/eef27894bff0235be3598b3bd9c14ca6d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Make allow_shutdown more precise
by Philipp Hörist 06 Dec '19

06 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: eef27894 by Daniel Brötzmann at 2019-12-06T21:48:56Z ChatControl: Make allow_shutdown more precise On closing a control this checks if logs are enabled for the contact/account and displays the appropriate message. - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1136,14 +1136,24 @@ class ChatControl(ChatControlBase): def allow_shutdown(self, method, on_yes, on_no, _on_minimize): time_ = app.last_message_time[self.account][self.get_full_jid()] + # 2 seconds if time.time() - time_ < 2: - # 2 seconds + no_log_for = app.config.get_per( + 'accounts', self.account, 'no_log_for').split() + more = '' + if self.contact.jid in no_log_for: + more = _('Note: Chat history is disabled for this contact.') + if self.account in no_log_for: + more = _('Note: Chat history is disabled for this account.') + text = _('You just received a new message from %s.\n' + 'Do you want to close this tab?') % self.contact.get_shown_name() + if more: + text += '\n' + more + NewConfirmationDialog( _('Close'), - _('You just received a new message ' - 'from %s') % self.contact.jid, - _('If you close this tab while having chat history disabled, ' - 'this message will be lost.'), + _('New Message'), + text, [DialogButton.make('Cancel', callback=lambda: on_no(self)), DialogButton.make('Remove', View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eef27894bff0235be3598b3bd9c14ca6d6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eef27894bff0235be3598b3bd9c14ca6d6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor pubsub notification handlers
by Philipp Hörist 06 Dec '19

06 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ff61353d by Philipp Hörist at 2019-12-06T21:35:53Z Refactor pubsub notification handlers Adapt to nbxmpp changes - - - - - 7 changed files: - gajim/common/modules/bookmarks.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_avatar.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -75,19 +75,8 @@ class Bookmarks(BaseModule): return self._pubsub_support() and self.conversion_2 @event_node(nbxmpp.NS_BOOKMARKS) - def _bookmark_event_received(self, _con, stanza, properties): + def _bookmark_event_received(self, _con, _stanza, properties): if properties.pubsub_event.retracted: - # Unsure how to handle that - return - - bookmarks = properties.pubsub_event.data - if properties.pubsub_event.deleted or properties.pubsub_event.purged: - self._log.info('Bookmark node deleted') - bookmarks = [] - - elif properties.pubsub_event.data is None: - self._log.warning('Invalid bookmark data') - self._log.warning(stanza) return if not properties.is_self_message: @@ -102,6 +91,10 @@ class Bookmarks(BaseModule): self._log.info('Ignore update, pubsub request in progress') return + bookmarks = properties.pubsub_event.data + if bookmarks is None: + bookmarks = [] + old_bookmarks = self._convert_to_set(self._bookmarks) self._bookmarks = bookmarks self._act_on_changed_bookmarks(old_bookmarks) @@ -109,7 +102,7 @@ class Bookmarks(BaseModule): NetworkEvent('bookmarks-received', account=self._account)) @event_node(nbxmpp.NS_BOOKMARKS_2) - def _bookmark_2_event_received(self, _con, stanza, properties): + def _bookmark_2_event_received(self, _con, _stanza, properties): if not properties.is_self_message: self._log.warning('%s has an open access bookmarks node', properties.jid) @@ -125,7 +118,7 @@ class Bookmarks(BaseModule): old_bookmarks = self._convert_to_set(self._bookmarks) if properties.pubsub_event.deleted or properties.pubsub_event.purged: - self._log.info('Bookmark node deleted') + self._log.info('Bookmark node deleted/purged') self._bookmarks = [] elif properties.pubsub_event.retracted: @@ -138,11 +131,6 @@ class Bookmarks(BaseModule): except KeyError: pass - elif properties.pubsub_event.data is None: - self._log.warning('Invalid bookmark data') - self._log.warning(stanza) - return - else: new_bookmark = properties.pubsub_event.data old_bookmark = self.get_bookmark_from_jid(new_bookmark.jid) ===================================== gajim/common/modules/user_activity.py ===================================== @@ -40,18 +40,19 @@ class UserActivity(BaseModule): @event_node(nbxmpp.NS_ACTIVITY) def _activity_received(self, _con, _stanza, properties): - data = properties.pubsub_event.data - empty = properties.pubsub_event.empty + if properties.pubsub_event.retracted: + return + data = properties.pubsub_event.data for contact in app.contacts.get_contacts(self._account, str(properties.jid)): - if not empty: + if data is not None: contact.pep[PEPEventType.ACTIVITY] = data else: contact.pep.pop(PEPEventType.ACTIVITY, None) if properties.is_self_message: - if not empty: + if data is not None: self._con.pep[PEPEventType.ACTIVITY] = data else: self._con.pep.pop(PEPEventType.ACTIVITY, None) ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -35,12 +35,14 @@ class UserAvatar(BaseModule): @event_node(nbxmpp.NS_AVATAR_METADATA) def _avatar_metadata_received(self, _con, _stanza, properties): + if properties.pubsub_event.retracted: + return + data = properties.pubsub_event.data - empty = properties.pubsub_event.empty jid = str(properties.jid) own_jid = self._con.get_own_jid().getBare() - if empty: + if data is None: # Remove avatar self._log.info('Remove: %s', jid) app.contacts.set_avatar(self._account, jid, None) ===================================== gajim/common/modules/user_location.py ===================================== @@ -37,18 +37,19 @@ class UserLocation(BaseModule): @event_node(nbxmpp.NS_LOCATION) def _location_received(self, _con, _stanza, properties): - data = properties.pubsub_event.data - empty = properties.pubsub_event.empty + if properties.pubsub_event.retracted: + return + data = properties.pubsub_event.data for contact in app.contacts.get_contacts(self._account, str(properties.jid)): - if not empty: + if data is not None: contact.pep[PEPEventType.LOCATION] = data else: contact.pep.pop(PEPEventType.LOCATION, None) if properties.is_self_message: - if not empty: + if data is not None: self._con.pep[PEPEventType.LOCATION] = data else: self._con.pep.pop(PEPEventType.LOCATION, None) ===================================== gajim/common/modules/user_mood.py ===================================== @@ -40,18 +40,19 @@ class UserMood(BaseModule): @event_node(nbxmpp.NS_MOOD) def _mood_received(self, _con, _stanza, properties): - data = properties.pubsub_event.data - empty = properties.pubsub_event.empty + if properties.pubsub_event.retracted: + return + data = properties.pubsub_event.data for contact in app.contacts.get_contacts(self._account, str(properties.jid)): - if not empty: + if data is not None: contact.pep[PEPEventType.MOOD] = data else: contact.pep.pop(PEPEventType.MOOD, None) if properties.is_self_message: - if not empty: + if data is not None: self._con.pep[PEPEventType.MOOD] = data else: self._con.pep.pop(PEPEventType.MOOD, None) ===================================== gajim/common/modules/user_nickname.py ===================================== @@ -38,6 +38,9 @@ class UserNickname(BaseModule): @event_node(nbxmpp.NS_NICK) def _nickname_received(self, _con, _stanza, properties): + if properties.pubsub_event.retracted: + return + nick = properties.pubsub_event.data if properties.is_self_message: if nick is None: ===================================== gajim/common/modules/user_tune.py ===================================== @@ -40,18 +40,19 @@ class UserTune(BaseModule): @event_node(nbxmpp.NS_TUNE) def _tune_received(self, _con, _stanza, properties): - data = properties.pubsub_event.data - empty = properties.pubsub_event.empty + if properties.pubsub_event.retracted: + return + data = properties.pubsub_event.data for contact in app.contacts.get_contacts(self._account, str(properties.jid)): - if not empty: + if data is not None: contact.pep[PEPEventType.TUNE] = data else: contact.pep.pop(PEPEventType.TUNE, None) if properties.is_self_message: - if not empty: + if data is not None: self._con.pep[PEPEventType.TUNE] = data else: self._con.pep.pop(PEPEventType.TUNE, None) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff61353d8d6d6b1a97d66db100da8a7eea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff61353d8d6d6b1a97d66db100da8a7eea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Pubsub: Unify pubsub notification parsing
by Philipp Hörist 06 Dec '19

06 Dec '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 024d1363 by Philipp Hörist at 2019-12-06T21:10:12Z Pubsub: Unify pubsub notification parsing PubSubEventData: - The data attribute is now always None if there is no data - The empty attribute was removed because the info is available in the data attribute - Pass delete, purge, retract always through to the application - - - - - a1589a5e by Philipp Hörist at 2019-12-06T21:10:49Z Tests: Add tests for pubsub notification parsing - - - - - 20 changed files: - nbxmpp/modules/activity.py - nbxmpp/modules/bookmarks.py - nbxmpp/modules/location.py - nbxmpp/modules/mood.py - nbxmpp/modules/nickname.py - nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py - nbxmpp/modules/pubsub.py - nbxmpp/modules/tune.py - nbxmpp/modules/user_avatar.py - nbxmpp/structs.py - + test/lib/const.py - + test/lib/util.py - + test/unit/test_activity.py - + test/unit/test_avatar.py - + test/unit/test_bookmarks.py - + test/unit/test_location.py - + test/unit/test_mood.py - + test/unit/test_pubsub.py - + test/unit/test_tune.py Changes: ===================================== nbxmpp/modules/activity.py ===================================== @@ -46,29 +46,32 @@ class Activity: return item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged + return activity_node = item.getTag('activity', namespace=NS_ACTIVITY) if not activity_node.getChildren(): - pubsub_event = properties.pubsub_event._replace(empty=True) log.info('Received activity: %s - no activity set', properties.jid) - else: - activity, subactivity, text = None, None, None - for child in activity_node.getChildren(): - name = child.getName() - if name == 'text': - text = child.getData() - elif name in ACTIVITIES: - activity = name - subactivity = self._parse_sub_activity(child) - - if activity is None and activity_node.getPayload(): - log.warning('No valid activity value found') - log.warning(stanza) - raise NodeProcessed - - data = ActivityData(activity, subactivity, text) - pubsub_event = properties.pubsub_event._replace(data=data) - log.info('Received activity: %s - %s', properties.jid, data) + return + + activity, subactivity, text = None, None, None + for child in activity_node.getChildren(): + name = child.getName() + if name == 'text': + text = child.getData() + elif name in ACTIVITIES: + activity = name + subactivity = self._parse_sub_activity(child) + + if activity is None and activity_node.getPayload(): + log.warning('No valid activity value found') + log.warning(stanza) + raise NodeProcessed + + data = ActivityData(activity, subactivity, text) + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received activity: %s - %s', properties.jid, data) properties.pubsub_event = pubsub_event ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -25,6 +25,7 @@ from nbxmpp.protocol import isResultNode from nbxmpp.protocol import Node from nbxmpp.protocol import Iq from nbxmpp.protocol import JID +from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler from nbxmpp.structs import BookmarkData from nbxmpp.const import BookmarkStoreType @@ -77,27 +78,28 @@ class Bookmarks: self._node_configuration_in_progress = False self._node_configuration_not_possible = False - def _process_pubsub_bookmarks(self, _con, _stanza, properties): + def _process_pubsub_bookmarks(self, _con, stanza, properties): if not properties.is_pubsub_event: return if properties.pubsub_event.node != NS_BOOKMARKS: return - if properties.pubsub_event.deleted or properties.pubsub_event.retracted: - return - item = properties.pubsub_event.item if item is None: + # Retract, Deleted or Purged return storage_node = item.getTag('storage', namespace=NS_BOOKMARKS) if storage_node is None: - return + log.warning('No storage node found') + log.warning(stanza) + raise NodeProcessed - bookmarks = [] - if storage_node.getChildren(): - bookmarks = self._parse_bookmarks(storage_node) + bookmarks = self._parse_bookmarks(storage_node) + if not bookmarks: + log.info('Bookmarks removed') + return pubsub_event = properties.pubsub_event._replace(data=bookmarks) log.info('Received bookmarks from: %s', properties.jid) @@ -113,16 +115,14 @@ class Bookmarks: if properties.pubsub_event.node != NS_BOOKMARKS_2: return - if properties.pubsub_event.deleted or properties.pubsub_event.retracted: - return - item = properties.pubsub_event.item if item is None: + # Retract, Deleted or Purged return bookmark_item = self._parse_bookmarks2(item) if bookmark_item is None: - return + raise NodeProcessed pubsub_event = properties.pubsub_event._replace(data=bookmark_item) log.info('Received bookmark item from: %s', properties.jid) @@ -183,7 +183,7 @@ class Bookmarks: log.warning(item) return - autojoin = conference.getAttr('autojoin') == 'true' + autojoin = conference.getAttr('autojoin') in ('True', 'true', '1') name = conference.getAttr('name') nick = conference.getTagData('nick') ===================================== nbxmpp/modules/location.py ===================================== @@ -45,18 +45,21 @@ class Location: return item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged + return location_node = item.getTag('geoloc', namespace=NS_LOCATION) if not location_node.getChildren(): - pubsub_event = properties.pubsub_event._replace(empty=True) log.info('Received location: %s - no location set', properties.jid) - else: - location_dict = {} - for node in LOCATION_DATA: - location_dict[node] = location_node.getTagData(node) - data = LocationData(**location_dict) - pubsub_event = properties.pubsub_event._replace(data=data) - log.info('Received location: %s - %s', properties.jid, data) + return + + location_dict = {} + for node in LOCATION_DATA: + location_dict[node] = location_node.getTagData(node) + data = LocationData(**location_dict) + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received location: %s - %s', properties.jid, data) properties.pubsub_event = pubsub_event ===================================== nbxmpp/modules/mood.py ===================================== @@ -46,28 +46,31 @@ class Mood: return item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged + return mood_node = item.getTag('mood', namespace=NS_MOOD) if not mood_node.getChildren(): - pubsub_event = properties.pubsub_event._replace(empty=True) - log.info('Received mood: %s - no mood set', properties.jid) - else: - mood, text = None, None - for child in mood_node.getChildren(): - name = child.getName().strip() - if name == 'text': - text = child.getData() - elif name in MOODS: - mood = name - - if mood is None and mood_node.getPayload(): - log.warning('No valid mood value found') - log.warning(stanza) - raise NodeProcessed - - data = MoodData(mood, text) - pubsub_event = properties.pubsub_event._replace(data=data) - log.info('Received mood: %s - %s', properties.jid, data) + log.info('Received mood: %s - removed mood', properties.jid) + return + + mood, text = None, None + for child in mood_node.getChildren(): + name = child.getName().strip() + if name == 'text': + text = child.getData() + elif name in MOODS: + mood = name + + if mood is None and mood_node.getPayload(): + log.warning('No valid mood value found') + log.warning(stanza) + raise NodeProcessed + + data = MoodData(mood, text) + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received mood: %s - %s', properties.jid, data) properties.pubsub_event = pubsub_event ===================================== nbxmpp/modules/nickname.py ===================================== @@ -64,12 +64,17 @@ class Nickname: if properties.pubsub_event.node != NS_NICK: return - nick = self._parse_nickname(properties.pubsub_event.item) + item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged + return + + nick = self._parse_nickname(item) if nick is None: - log.info('Received nickname: %s - no nickname set', properties.jid) - else: - log.info('Received nickname: %s - %s', properties.jid, nick) + log.info('Received nickname: %s - nickname removed', properties.jid) + return + log.info('Received nickname: %s - %s', properties.jid, nick) properties.pubsub_event = properties.pubsub_event._replace(data=nick) @staticmethod ===================================== nbxmpp/modules/omemo.py ===================================== @@ -133,15 +133,11 @@ class OMEMO: if properties.pubsub_event.node != NS_OMEMO_TEMP_DL: return - if properties.pubsub_event.retracted: - # Retracts should not happen and its unclear how we should react - raise NodeProcessed - - if properties.pubsub_event.deleted: - log.info('Devicelist node deleted by %s', properties.jid) + item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged return - item = properties.pubsub_event.item try: devices = self._parse_devicelist(item) except StanzaMalformed as error: @@ -150,13 +146,13 @@ class OMEMO: raise NodeProcessed if not devices: - pubsub_event = properties.pubsub_event._replace(empty=True) log.info('Received OMEMO devicelist: %s - no devices set', properties.jid) - else: - pubsub_event = properties.pubsub_event._replace(data=devices) - log.info('Received OMEMO devicelist: %s - %s', - properties.jid, devices) + return + + pubsub_event = properties.pubsub_event._replace(data=devices) + log.info('Received OMEMO devicelist: %s - %s', + properties.jid, devices) properties.pubsub_event = pubsub_event @@ -172,15 +168,12 @@ class OMEMO: </item> </items> ''' - if item is None: - return [] - list_node = item.getTag('list', namespace=NS_OMEMO_TEMP) if list_node is None: raise StanzaMalformed('No list node found') if not list_node.getChildren(): - return [] + return None result = [] devices_nodes = list_node.getChildren() ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -101,15 +101,11 @@ class OpenPGP: </public-keys-list> </item> ''' - if properties.pubsub_event.retracted: - # Retracts should not happen and its unclear how we should react - raise NodeProcessed - - if properties.pubsub_event.deleted: - log.info('Keylist node deleted by %s', properties.jid) + item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged return - item = properties.pubsub_event.item try: data = self._parse_keylist(properties.jid, item) except StanzaMalformed as error: @@ -118,26 +114,23 @@ class OpenPGP: raise NodeProcessed if data is None: - pubsub_event = properties.pubsub_event._replace(empty=True) log.info('Received PGP keylist: %s - no keys set', properties.jid) - else: - pubsub_event = properties.pubsub_event._replace(data=data) - log.info('Received PGP keylist: %s - %s', properties.jid, data) + return + + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received PGP keylist: %s - %s', properties.jid, data) properties.pubsub_event = pubsub_event @staticmethod def _parse_keylist(jid, item): - if item is None: - return [] - keylist_node = item.getTag('public-keys-list', namespace=NS_OPENPGP) if keylist_node is None: raise StanzaMalformed('No public-keys-list node found') metadata = keylist_node.getTags('pubkey-metadata') if not metadata: - return [] + return None data = [] for key in metadata: ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -58,13 +58,12 @@ class PubSub: if delete is not None: node = delete.getAttr('node') properties.pubsub_event = PubSubEventData( - node, empty=True, deleted=True) + node, deleted=True) return purge = event.getTag('purge') if purge is not None: node = purge.getAttr('node') - item = purge.getTag('item') properties.pubsub_event = PubSubEventData(node, purged=True) return @@ -80,12 +79,14 @@ class PubSub: return if len(items.getChildren()) != 1: - log.warning('PubSub event with more than one item') + log.warning('PubSub event with != 1 item') log.warning(stanza) return item = items.getTag('item') if item is None: + log.warning('No item node found') + log.warning(stanza) return id_ = item.getAttr('id') properties.pubsub_event = PubSubEventData(node, id_, item) ===================================== nbxmpp/modules/tune.py ===================================== @@ -45,19 +45,22 @@ class Tune: return item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged + return tune_node = item.getTag('tune', namespace=NS_TUNE) if not tune_node.getChildren(): - pubsub_event = properties.pubsub_event._replace(empty=True) log.info('Received tune: %s - no tune set', properties.jid) - else: - tune_dict = {} - for attr in TUNE_DATA: - tune_dict[attr] = tune_node.getTagData(attr) + return + + tune_dict = {} + for attr in TUNE_DATA: + tune_dict[attr] = tune_node.getTagData(attr) - data = TuneData(**tune_dict) - pubsub_event = properties.pubsub_event._replace(data=data) - log.info('Received tune: %s - %s', properties.jid, data) + data = TuneData(**tune_dict) + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received tune: %s - %s', properties.jid, data) properties.pubsub_event = pubsub_event ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -53,6 +53,9 @@ class UserAvatar: return item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged + return metadata = item.getTag('metadata', namespace=NS_AVATAR_METADATA) if metadata is None: @@ -61,20 +64,20 @@ class UserAvatar: raise NodeProcessed if not metadata.getChildren(): - pubsub_event = properties.pubsub_event._replace(empty=True) log.info('Received avatar metadata: %s - no avatar set', properties.jid) - else: - info = metadata.getTags('info', one=True) - try: - data = AvatarMetaData(**info.getAttrs()) - except Exception: - log.warning('Malformed user avatar data') - log.warning(stanza) - raise NodeProcessed - - pubsub_event = properties.pubsub_event._replace(data=data) - log.info('Received avatar metadata: %s - %s', properties.jid, data) + return + + info = metadata.getTags('info', one=True) + try: + data = AvatarMetaData(**info.getAttrs()) + except Exception: + log.warning('Malformed user avatar data') + log.warning(stanza) + raise NodeProcessed + + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received avatar metadata: %s - %s', properties.jid, data) properties.pubsub_event = pubsub_event ===================================== nbxmpp/structs.py ===================================== @@ -73,8 +73,8 @@ HTTPAuthData.__new__.__defaults__ = (None, None, None, None) StanzaIDData = namedtuple('StanzaIDData', 'id by') StanzaIDData.__new__.__defaults__ = (None, None) -PubSubEventData = namedtuple('PubSubEventData', 'node id item data empty deleted retracted purged') -PubSubEventData.__new__.__defaults__ = (None, None, None, False, False, False, False) +PubSubEventData = namedtuple('PubSubEventData', 'node id item data deleted retracted purged') +PubSubEventData.__new__.__defaults__ = (None, None, None, False, False, False) PubSubConfigResult = namedtuple('PubSubConfigResult', 'jid node form') ===================================== test/lib/const.py ===================================== @@ -0,0 +1,2 @@ + +STREAM_START = "<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client'>" ===================================== test/lib/util.py ===================================== @@ -0,0 +1,26 @@ +import unittest +from unittest.mock import Mock + +from test.lib.const import STREAM_START + +from nbxmpp import dispatcher +from nbxmpp.protocol import NS_CLIENT +from nbxmpp.protocol import JID + + +class StanzaHandlerTest(unittest.TestCase): + def setUp(self): + self.dispatcher = dispatcher.XMPPDispatcher() + + # Setup mock client + self.client = Mock() + self.client.get_bound_jid.return_value = JID('test(a)test.test') + self.client.defaultNamespace = NS_CLIENT + self.client.Connection = Mock() # mock transport + self.con = self.client.Connection + + self.dispatcher.PlugIn(self.client) + + # Simulate that we have established a connection + self.dispatcher.StreamInit() + self.dispatcher.ProcessNonBlocking(STREAM_START) ===================================== test/unit/test_activity.py ===================================== @@ -0,0 +1,53 @@ +from test.lib.util import StanzaHandlerTest + +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import ActivityData +from nbxmpp.structs import PubSubEventData + + +class ActivityTest(StanzaHandlerTest): + + def test_activity_parsing(self): + def _on_message(_con, _stanza, properties): + + data = ActivityData(activity='relaxing', + subactivity='partying', + text='My nurse\'s birthday!') + + pubsub_event = PubSubEventData( + node='http://jabber.org/protocol/activity', + id='b5ac48d0-0f9c-11dc-8754-001143d5d5db', + item=None, + data=data, + deleted=False, + retracted=False, + purged=False) + + # We cant compare Node objects + pubsub_event_ = properties.pubsub_event._replace(item=None) + self.assertEqual(pubsub_event, pubsub_event_) + + event = ''' + <message from='test(a)test.test'> + <event xmlns='http://jabber.org/protocol/pubsub#event'> + <items node='http://jabber.org/protocol/activity'> + <item id='b5ac48d0-0f9c-11dc-8754-001143d5d5db'> + <activity xmlns='http://jabber.org/protocol/activity'> + <relaxing> + <partying/> + </relaxing> + <text xml:lang='en'>My nurse's birthday!</text> + </activity> + </item> + </items> + </event> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT)) + + self.dispatcher.ProcessNonBlocking(event) ===================================== test/unit/test_avatar.py ===================================== @@ -0,0 +1,58 @@ +from test.lib.util import StanzaHandlerTest + +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import AvatarMetaData +from nbxmpp.structs import PubSubEventData + + +class AvatarTest(StanzaHandlerTest): + + def test_avatar_parsing(self): + def _on_message(_con, _stanza, properties): + + data = AvatarMetaData(bytes='12345', + height='64', + width='64', + id='111f4b3c50d7b0df729d299bc6f8e9ef9066971f', + type='image/png', + url='http://avatars.example.org/happy.gif') + + pubsub_event = PubSubEventData( + node='urn:xmpp:avatar:metadata', + id='111f4b3c50d7b0df729d299bc6f8e9ef9066971f', + item=None, + data=data, + deleted=False, + retracted=False, + purged=False) + + # We cant compare Node objects + pubsub_event_ = properties.pubsub_event._replace(item=None) + self.assertEqual(pubsub_event, pubsub_event_) + + event = ''' + <message from='test(a)test.test'> + <event xmlns='http://jabber.org/protocol/pubsub#event'> + <items node='urn:xmpp:avatar:metadata'> + <item id='111f4b3c50d7b0df729d299bc6f8e9ef9066971f'> + <metadata xmlns='urn:xmpp:avatar:metadata'> + <info bytes='12345' + height='64' + id='111f4b3c50d7b0df729d299bc6f8e9ef9066971f' + type='image/png' + width='64' + url='http://avatars.example.org/happy.gif'/> + </metadata> + </item> + </items> + </event> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT)) + + self.dispatcher.ProcessNonBlocking(event) ===================================== test/unit/test_bookmarks.py ===================================== @@ -0,0 +1,114 @@ +from test.lib.util import StanzaHandlerTest + +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import JID +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import BookmarkData +from nbxmpp.structs import PubSubEventData + + +class BookmarkTest(StanzaHandlerTest): + + def test_bookmark_1_parsing(self): + def _on_message(_con, _stanza, properties): + + data = [ + BookmarkData(jid=JID('theplay(a)conference.shakespeare.lit'), + name='The Play\'s the Thing', + autojoin=True, + password='pass', + nick='JC'), + BookmarkData(jid=JID('second(a)conference.shakespeare.lit'), + name='Second room', + autojoin=False, + password=None, + nick=None) + ] + + pubsub_event = PubSubEventData( + node='storage:bookmarks', + id='current', + item=None, + data=data, + deleted=False, + retracted=False, + purged=False) + + # We cant compare Node objects + pubsub_event_ = properties.pubsub_event._replace(item=None) + self.assertEqual(pubsub_event, pubsub_event_) + + event = ''' + <message from='test(a)test.test'> + <event xmlns='http://jabber.org/protocol/pubsub#event'> + <items node='storage:bookmarks'> + <item id='current'> + <storage xmlns='storage:bookmarks'> + <conference name='The Play's the Thing' + autojoin='true' + jid='theplay(a)conference.shakespeare.lit'> + <password>pass</password> + <nick>JC</nick> + </conference> + <conference name='Second room' + autojoin='0' + jid='second(a)conference.shakespeare.lit'> + </conference> + </storage> + </item> + </items> + </event> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT)) + + self.dispatcher.ProcessNonBlocking(event) + + def test_bookmark_2_parsing(self): + def _on_message(_con, _stanza, properties): + + data = BookmarkData(jid=JID('theplay(a)conference.shakespeare.lit'), + name='The Play\'s the Thing', + autojoin=True, + password=None, + nick='JC') + + pubsub_event = PubSubEventData( + node='urn:xmpp:bookmarks:0', + id='theplay(a)conference.shakespeare.lit', + item=None, + data=data, + deleted=False, + retracted=False, + purged=False) + + # We cant compare Node objects + pubsub_event_ = properties.pubsub_event._replace(item=None) + self.assertEqual(pubsub_event, pubsub_event_) + + event = ''' + <message from='test(a)test.test'> + <event xmlns='http://jabber.org/protocol/pubsub#event'> + <items node='urn:xmpp:bookmarks:0'> + <item id='theplay(a)conference.shakespeare.lit'> + <conference xmlns='urn:xmpp:bookmarks:0' + name='The Play's the Thing' + autojoin='1'> + <nick>JC</nick> + </conference> + </item> + </items> + </event> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT)) + + self.dispatcher.ProcessNonBlocking(event) ===================================== test/unit/test_location.py ===================================== @@ -0,0 +1,94 @@ +from test.lib.util import StanzaHandlerTest + +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import LocationData +from nbxmpp.structs import PubSubEventData + + +class LocationTest(StanzaHandlerTest): + + def test_location_parsing(self): + def _on_message(_con, _stanza, properties): + + data = LocationData(accuracy='20', + alt='1609', + altaccuracy='10', + area='Central Park', + bearing='12.33', + building='The Empire State Building', + country='United States', + countrycode='US', + datum='Some datum', + description='Bill\'s house', + error='290.8882087', + floor='102', + lat='39.75', + locality='New York City', + lon='-104.99', + postalcode='10118', + region='New York', + room='Observatory', + speed='52.69', + street='350 Fifth Avenue / 34th and Broadway', + text='Northwest corner of the lobby', + timestamp='2004-02-19T21:12Z', + tzo='-07:00', + uri='http://www.nyc.com/') + + pubsub_event = PubSubEventData( + node='http://jabber.org/protocol/geoloc', + id='d81a52b8-0f9c-11dc-9bc8-001143d5d5db', + item=None, + data=data, + deleted=False, + retracted=False, + purged=False) + + # We cant compare Node objects + pubsub_event_ = properties.pubsub_event._replace(item=None) + self.assertEqual(pubsub_event, pubsub_event_) + + event = ''' + <message from='test(a)test.test'> + <event xmlns='http://jabber.org/protocol/pubsub#event'> + <items node='http://jabber.org/protocol/geoloc'> + <item id='d81a52b8-0f9c-11dc-9bc8-001143d5d5db'> + <geoloc xmlns='http://jabber.org/protocol/geoloc' xml:lang='en'> + <accuracy>20</accuracy> + <alt>1609</alt> + <altaccuracy>10</altaccuracy> + <area>Central Park</area> + <bearing>12.33</bearing> + <building>The Empire State Building</building> + <country>United States</country> + <countrycode>US</countrycode> + <datum>Some datum</datum> + <description>Bill's house</description> + <error>290.8882087</error> + <floor>102</floor> + <lat>39.75</lat> + <locality>New York City</locality> + <lon>-104.99</lon> + <postalcode>10118</postalcode> + <region>New York</region> + <room>Observatory</room> + <speed>52.69</speed> + <street>350 Fifth Avenue / 34th and Broadway</street> + <text>Northwest corner of the lobby</text> + <timestamp>2004-02-19T21:12Z</timestamp> + <tzo>-07:00</tzo> + <uri>http://www.nyc.com/</uri> + </geoloc> + </item> + </items> + </event> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT)) + + self.dispatcher.ProcessNonBlocking(event) ===================================== test/unit/test_mood.py ===================================== @@ -0,0 +1,49 @@ +from test.lib.util import StanzaHandlerTest + +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import MoodData +from nbxmpp.structs import PubSubEventData + + +class MoodTest(StanzaHandlerTest): + + def test_mood_parsing(self): + def _on_message(_con, _stanza, properties): + + data = MoodData(mood='annoyed', text='curse my nurse!') + + pubsub_event = PubSubEventData( + node='http://jabber.org/protocol/mood', + id='a475804a-0f9c-11dc-98a8-001143d5d5db', + item=None, + data=data, + deleted=False, + retracted=False, + purged=False) + + # We cant compare Node objects + pubsub_event_ = properties.pubsub_event._replace(item=None) + self.assertEqual(pubsub_event, pubsub_event_) + + event = ''' + <message from='test(a)test.test'> + <event xmlns='http://jabber.org/protocol/pubsub#event'> + <items node='http://jabber.org/protocol/mood'> + <item id='a475804a-0f9c-11dc-98a8-001143d5d5db'> + <mood xmlns='http://jabber.org/protocol/mood'> + <annoyed/> + <text>curse my nurse!</text> + </mood> + </item> + </items> + </event> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT)) + + self.dispatcher.ProcessNonBlocking(event) ===================================== test/unit/test_pubsub.py ===================================== @@ -0,0 +1,99 @@ +from test.lib.util import StanzaHandlerTest + +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import PubSubEventData + + +class PubsubTest(StanzaHandlerTest): + + def test_purge_event(self): + def _on_message(_con, _stanza, properties): + + pubsub_event = PubSubEventData( + node='princely_musings', + id=None, + item=None, + data=None, + deleted=False, + retracted=False, + purged=True) + + self.assertEqual(pubsub_event, properties.pubsub_event) + + event = ''' + <message from='test(a)test.test' id='b5ac48d0-0f9c-11dc-8754-001143d5d5db'> + <event xmlns='http://jabber.org/protocol/pubsub#event'> + <purge node='princely_musings'/> + </event> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT, + priority=16)) + + self.dispatcher.ProcessNonBlocking(event) + + def test_delete_event(self): + def _on_message(_con, _stanza, properties): + + pubsub_event = PubSubEventData( + node='princely_musings', + id=None, + item=None, + data=None, + deleted=True, + retracted=False, + purged=False) + + self.assertEqual(pubsub_event, properties.pubsub_event) + + event = ''' + <message from='test(a)test.test' id='b5ac48d0-0f9c-11dc-8754-001143d5d5db'> + <delete node='princely_musings'> + <redirect uri='xmpp:hamlet@denmark.lit?;node=blog'/> + </delete> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT, + priority=16)) + + self.dispatcher.ProcessNonBlocking(event) + + + def test_retracted_event(self): + def _on_message(_con, _stanza, properties): + + pubsub_event = PubSubEventData( + node='princely_musings', + id='ae890ac52d0df67ed7cfdf51b644e901', + item=None, + data=None, + deleted=False, + retracted=True, + purged=False) + + self.assertEqual(pubsub_event, properties.pubsub_event) + + event = ''' + <message from='test(a)test.test' id='b5ac48d0-0f9c-11dc-8754-001143d5d5db'> + <items node='princely_musings'> + <retract id='ae890ac52d0df67ed7cfdf51b644e901'/> + </items> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT, + priority=16)) + + self.dispatcher.ProcessNonBlocking(event) ===================================== test/unit/test_tune.py ===================================== @@ -0,0 +1,60 @@ +from test.lib.util import StanzaHandlerTest + +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import TuneData +from nbxmpp.structs import PubSubEventData + + +class TuneTest(StanzaHandlerTest): + + def test_tune_parsing(self): + def _on_message(_con, _stanza, properties): + + data = TuneData(artist='Yes', + length='686', + rating='8', + source='Yessongs', + title='Heart of the Sunrise', + track='3', + uri='https://www.artist.com') + + pubsub_event = PubSubEventData( + node='http://jabber.org/protocol/tune', + id='bffe6584-0f9c-11dc-84ba-001143d5d5db', + item=None, + data=data, + deleted=False, + retracted=False, + purged=False) + + # We cant compare Node objects + pubsub_event_ = properties.pubsub_event._replace(item=None) + self.assertEqual(pubsub_event, pubsub_event_) + + event = ''' + <message from='test(a)test.test'> + <event xmlns='http://jabber.org/protocol/pubsub#event'> + <items node='http://jabber.org/protocol/tune'> + <item id='bffe6584-0f9c-11dc-84ba-001143d5d5db'> + <tune xmlns='http://jabber.org/protocol/tune'> + <artist>Yes</artist> + <length>686</length> + <rating>8</rating> + <source>Yessongs</source> + <title>Heart of the Sunrise</title> + <track>3</track> + <uri>https://www.artist.com</uri> + </tune> + </item> + </items> + </event> + </message> + ''' + + self.dispatcher.RegisterHandler( + *StanzaHandler(name='message', + callback=_on_message, + ns=NS_PUBSUB_EVENT)) + + self.dispatcher.ProcessNonBlocking(event) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/dc337d8c124047863696057a7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/dc337d8c124047863696057a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Appdata: Fix donation link
by Yann Leboulanger 06 Dec '19

06 Dec '19

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 16000e3d by André Apitzsch at 2019-12-06T08:32:57Z Appdata: Fix donation link - - - - - f3af4de8 by André Apitzsch at 2019-12-06T08:32:57Z Appdata: Add copyright information See https://blogs.gnome.org/hughsie/2013/10/01/copyright-in-appdata-files/ for details. - - - - - 1 changed file: - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> + <component type="desktop-application"> <id>org.gajim.Gajim.desktop</id> <provides> @@ -75,7 +76,7 @@ <url type="bugtracker">https://dev.gajim.org/gajim/gajim</url> <url type="faq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</url> <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/Help</url> - <url type="donation">https://gajim.org/dev.php#donate</url> + <url type="donation">https://gajim.org/development/#donating</url> <url type="translate">https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate</url> <translation type="gettext">gajim</translation> <content_rating type="oars-1.0"> View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/06f2b08f674702fdbacff23fab63197d8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/06f2b08f674702fdbacff23fab63197d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] there is no more core plugins. see [765180d1]
by Yann Leboulanger 06 Dec '19

06 Dec '19

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 06f2b08f by Yann Leboulanger at 2019-12-06T08:25:49Z there is no more core plugins. see [765180d1] - - - - - 1 changed file: - scripts/dev/plugins_translate Changes: ===================================== scripts/dev/plugins_translate ===================================== @@ -14,13 +14,6 @@ check_args() init_ln() { - if [ -e "core_plugins" ] && [ ! -L "core_plugins" ]; then - echo "core_plugins must be a symbolic link" >&2 - exit 1 - fi - if [ ! -e "core_plugins" ]; then - ln -s ../../plugins core_plugins - fi if [ ! -L "community_plugins" ]; then echo "community_plugins should be a symbolic link to gajim-plugins repository, else they won't be in po files" fi View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/06f2b08f674702fdbacff23fab63197d83… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/06f2b08f674702fdbacff23fab63197d83… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Pylint: Don't check for optional module
by Philipp Hörist 02 Dec '19

02 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 69770417 by Philipp Hörist at 2019-12-02T21:26:20Z Pylint: Don't check for optional module - - - - - 0b11fb4b by Philipp Hörist at 2019-12-02T21:27:32Z Update pylintrc pylint throws false positive no-member errors because the class is overridden in pygobject and pylint seem not to pick up on this - - - - - 713a95fb by Philipp Hörist at 2019-12-02T21:42:29Z CI: Update pylint script - - - - - 3 changed files: - gajim/common/dbus/location.py - pylintrc - scripts/dev/pylint-ci.sh Changes: ===================================== gajim/common/dbus/location.py ===================================== @@ -23,7 +23,7 @@ from nbxmpp.structs import LocationData from gajim.common import app if app.is_installed('GEOCLUE'): - from gi.repository import Geoclue # pylint: disable=ungrouped-imports + from gi.repository import Geoclue # pylint: disable=ungrouped-imports,no-name-in-module log = logging.getLogger('gajim.c.dbus.location') ===================================== pylintrc ===================================== @@ -140,7 +140,7 @@ ignore-mixin-members=yes # List of class names for which member attributes should not be checked (useful # for classes with dynamically set attributes). This supports the use of # qualified names. -ignored-classes=optparse.Values,thread._local,_thread._local +ignored-classes=optparse.Values,thread._local,_thread._local,gi.repository.GLib.Error # List of module names for which member attributes should not be checked # (useful for modules/projects where namespaces are manipulated during runtime ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -11,9 +11,10 @@ IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,E1101,E1133,E1136,R "$PYLINT" --version -"$PYLINT" --disable=$IGNORE_ERRORS --ignore=modules,gtk "$@" +"$PYLINT" --disable=$IGNORE_ERRORS --ignore=modules,dbus,gtk "$@" "$PYLINT" --disable=$IGNORE_GTK_MODULE_ERRORS "$@/gtk" "$PYLINT" --disable=E0401,C0415 "$@/common/modules" +"$PYLINT" "$@/common/dbus" # C0103 invalid-name # C0301 line-too-long View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2499d4dc20bf30b1bc701b8962c4d8e6d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2499d4dc20bf30b1bc701b8962c4d8e6d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CI: Update pylint script
by Philipp Hörist 01 Dec '19

01 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2499d4dc by Philipp Hörist at 2019-12-01T12:47:52Z CI: Update pylint script Ignore import-outside-toplevel - - - - - 1 changed file: - scripts/dev/pylint-ci.sh Changes: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -13,7 +13,7 @@ IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,E1101,E1133,E1136,R "$PYLINT" --disable=$IGNORE_ERRORS --ignore=modules,gtk "$@" "$PYLINT" --disable=$IGNORE_GTK_MODULE_ERRORS "$@/gtk" -"$PYLINT" --disable=E0401 "$@/common/modules" +"$PYLINT" --disable=E0401,C0415 "$@/common/modules" # C0103 invalid-name # C0301 line-too-long View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2499d4dc20bf30b1bc701b8962c4d8e6d0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2499d4dc20bf30b1bc701b8962c4d8e6d0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: MusicTrackListener: Fix pylint errors
by Philipp Hörist 01 Dec '19

01 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 975d0081 by Philipp Hörist at 2019-12-01T11:23:46Z MusicTrackListener: Fix pylint errors - - - - - 0f6f860f by Philipp Hörist at 2019-12-01T12:04:28Z CI: Update pylint script Ignore import-outside-toplevel - - - - - 4c7af48c by Philipp Hörist at 2019-12-01T12:05:37Z Bytestream: Fix pylint error - - - - - 652ef0af by Philipp Hörist at 2019-12-01T12:05:59Z Jingle: Fix pylint errors - - - - - 75c28d25 by Philipp Hörist at 2019-12-01T12:07:59Z CI: Upgrade pylint to version 2.4.4 - - - - - fe096977 by Philipp Hörist at 2019-12-01T12:43:23Z Fix various pylint errors - - - - - 14 changed files: - .gitlab-ci.yml - gajim/common/connection.py - gajim/common/dbus/music_track.py - gajim/common/file_props.py - gajim/common/helpers.py - gajim/common/jingle_session.py - gajim/common/modules/bytestream.py - gajim/common/modules/jingle.py - gajim/gtk/discovery.py - gajim/gtk/htmltextview.py - gajim/gui_interface.py - gajim/message_window.py - gajim/remote_control.py - scripts/dev/pylint-ci.sh Changes: ===================================== .gitlab-ci.yml ===================================== @@ -14,7 +14,7 @@ run-tests: - . ./civenv/bin/activate - pip3 install mypy - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master --upgrade - - pip3 install pylint==2.3.1 + - pip3 install pylint==2.4.4 - /home/gitlab-runner/.local/bin/mypy gajim - scripts/dev/pylint-ci.sh --jobs=2 gajim - python3 setup.py test -s test.no_gui ===================================== gajim/common/connection.py ===================================== @@ -1423,9 +1423,9 @@ class Connection(CommonConnection, ConnectionHandlers): '_stun._udp.' + helpers.idn_to_ascii(hostname), self._on_stun_resolved) - def _on_stun_resolved(self, host, result_array): + def _on_stun_resolved(self, _host, result_array): if result_array: - self._stun_servers = self._hosts = [i for i in result_array] + self._stun_servers = self._hosts = result_array @helpers.call_counter def connect_machine(self, restart=False): ===================================== gajim/common/dbus/music_track.py ===================================== @@ -32,6 +32,13 @@ MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.' class MusicTrackInfo: __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', 'paused'] + def __init__(self): + self.title = None + self.album = None + self.artist = None + self.duration = None + self.track_number = None + self.paused = None class MusicTrackListener(GObject.GObject): @@ -167,11 +174,7 @@ class MusicTrackListener(GObject.GObject): info = MusicTrackInfo() info.title = meta.get('xesam:title') info.album = meta.get('xesam:album') - artist = meta.get('xesam:artist') - if artist: - info.artist = artist[0] - else: - info.artist = None + info.artist = meta.get('xesam:artist') info.duration = float(meta.get('mpris:length', 0)) info.track_number = meta.get('xesam:trackNumber', 0) ===================================== gajim/common/file_props.py ===================================== @@ -87,7 +87,8 @@ class FilesProp: def deleteFileProp(cls, file_prop): files_props = cls._files_props a = s = None - for account, sid in files_props: + for key in files_props: + account, sid = key fp = files_props[account, sid] if fp is file_prop: a = account ===================================== gajim/common/helpers.py ===================================== @@ -263,8 +263,7 @@ def temp_failure_retry(func, *args, **kwargs): except (os.error, IOError, select.error) as ex: if ex.errno == errno.EINTR: continue - else: - raise + raise def get_uf_show(show, use_mnemonic=False): """ ===================================== gajim/common/jingle_session.py ===================================== @@ -383,7 +383,7 @@ class JingleSession: if child.getNamespace() == nbxmpp.NS_JINGLE_ERRORS: error_name = child.getName() break - elif child.getNamespace() == nbxmpp.NS_STANZAS: + if child.getNamespace() == nbxmpp.NS_STANZAS: error_name = child.getName() self.__dispatch_error(error_name, text, error.getAttr('type')) ===================================== gajim/common/modules/bytestream.py ===================================== @@ -548,7 +548,7 @@ class Bytestream(BaseModule): iq.setID(auth_id) self._con.connection.send(iq) - def _on_bytestream_error(self, con, iq_obj): + def _on_bytestream_error(self, _con, iq_obj): id_ = iq_obj.getAttr('id') frm = helpers.get_full_jid_from_iq(iq_obj) query = iq_obj.getTag('query') ===================================== gajim/common/modules/jingle.py ===================================== @@ -105,7 +105,7 @@ class Jingle(BaseModule): self._log.info('Pubkey result from %s', jid_from) jingle_xtls.handle_new_cert(con, stanza, jid_from) - def _on_jingle_iq(self, con, stanza, properties): + def _on_jingle_iq(self, _con, stanza, _properties): """ The jingle stanza dispatcher ===================================== gajim/gtk/discovery.py ===================================== @@ -870,7 +870,7 @@ class AgentBrowser: if identity.category == 'server' and identity.name is not None: name = identity.name break - elif identities[0].name is not None: + if identities[0].name is not None: name = identities[0].name if name: ===================================== gajim/gtk/htmltextview.py ===================================== @@ -638,7 +638,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler): tag = self.textbuf.create_tag() # we create anonymous tag for attr, val in style_iter(style): attr = attr.lower() - val = val try: getattr(self, self.__style_methods[attr])(tag, val) except KeyError: ===================================== gajim/gui_interface.py ===================================== @@ -1445,7 +1445,6 @@ class Interface: @staticmethod def _create_muc_data(account, room_jid, password, config): nick = app.nicks[account] - password = password # Fetch data from bookmarks con = app.connections[account] ===================================== gajim/message_window.py ===================================== @@ -779,7 +779,7 @@ class MessageWindow(EventHelper): if ctrl.get_nb_unread() > 0: found = True break # found - elif app.config.get('ctrl_tab_go_to_next_composing'): + if app.config.get('ctrl_tab_go_to_next_composing'): # Search for a composing contact contact = ctrl.contact if first_composing_ind == -1 and contact.chatstate == 'composing': ===================================== gajim/remote_control.py ===================================== @@ -592,14 +592,14 @@ class GajimRemote(Server): connected_account = acct break # jid is in roster - elif contact: + if contact: minimized_control = \ jid in app.interface.minimized_controls[acct] connected_account = acct break # we send the message to jid not in roster, because account is # specified, or there is only one account - elif account: + if account: connected_account = acct elif first_connected_acct is None: first_connected_acct = acct ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -5,9 +5,9 @@ set -e PYLINT=${PYLINT:-pylint} -IGNORE_ERRORS=C0103,C0302,C0301,C0330,E0401,E0611,E1101,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 +IGNORE_ERRORS=C0103,C0302,C0301,C0330,C0415,E0401,E0611,E1101,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 -IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,E0401,E0611,E1101,E1133,E1136,R0201,R0904,R0915,R1710,W0201,W0212,W0233,W0221,W0613 +IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,E1101,E1133,E1136,R0201,R0904,R0915,R1710,W0201,W0212,W0233,W0221,W0613 "$PYLINT" --version @@ -19,6 +19,7 @@ IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,E0401,E0611,E1101,E1133,E1136,R0201,R # C0301 line-too-long # C0302 too-many-lines # C0330 bad-continuation +# C0415 import-outside-toplevel # E0401 import-error # E0611 no-name-in-module # E1101 no-member View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/390bae9da412fd65438cfd8c69ca96ffc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/390bae9da412fd65438cfd8c69ca96ffc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: CI: Update pylint script
by Philipp Hörist 30 Nov '19

30 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 34bd076a by Philipp Hörist at 2019-11-30T21:53:23Z CI: Update pylint script - - - - - 390bae9d by Philipp Hörist at 2019-11-30T22:14:35Z Accounts: Remove unused import - - - - - 2 changed files: - gajim/gtk/accounts.py - scripts/dev/pylint-ci.sh Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -27,8 +27,6 @@ from gajim.common import app from gajim.common import passwords from gajim.common.i18n import _ -from gajim import gui_menu_builder - from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.const import Setting ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -7,9 +7,12 @@ PYLINT=${PYLINT:-pylint} IGNORE_ERRORS=C0103,C0302,C0301,C0330,E0401,E0611,E1101,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 +IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,E0401,E0611,E1101,E1133,E1136,R0201,R0904,R0915,R1710,W0201,W0212,W0233,W0221,W0613 + "$PYLINT" --version -"$PYLINT" --disable=IGNORE_ERRORS --ignore=modules "$@" +"$PYLINT" --disable=$IGNORE_ERRORS --ignore=modules,gtk "$@" +"$PYLINT" --disable=$IGNORE_GTK_MODULE_ERRORS "$@/gtk" "$PYLINT" --disable=E0401 "$@/common/modules" # C0103 invalid-name View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/97313071ff2e1c7fd4f8039fb6771ca4b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/97313071ff2e1c7fd4f8039fb6771ca4b… 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