Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] MAM: Request from last received stanza-id
by Philipp Hörist 29 Jul '18

29 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 137bf1f8 by Philipp Hörist at 2018-07-29T21:16:13Z MAM: Request from last received stanza-id Record stanza-ids from live messages. If Gajim is started query the archive from the last received stanza-id - - - - - 5 changed files: - gajim/common/connection_handlers.py - gajim/common/logger.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/session.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -268,7 +268,7 @@ class ConnectionHandlersBase: if obj.conn.name != self.name: return - self._check_for_mam_compliance(obj.jid, obj.unique_id) + self._check_for_mam_compliance(obj.jid, obj.stanza_id) if (app.config.should_log(obj.conn.name, obj.jid) and obj.msgtxt and obj.nick): @@ -282,8 +282,10 @@ class ConnectionHandlersBase: message=obj.msgtxt, contact_name=obj.nick, additional_data=obj.additional_data, - stanza_id=obj.unique_id) + stanza_id=obj.stanza_id) app.logger.set_room_last_message_time(obj.room_jid, obj.timestamp) + self.get_module('MAM').save_archive_id( + obj.room_jid, obj.stanza_id, obj.timestamp) # process and dispatch an error message def dispatch_error_message(self, msg, msgtxt, session, frm, tim): ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1429,10 +1429,11 @@ class Logger: exists = self.get_archive_timestamp(jid) if not exists: sql = '''INSERT INTO last_archive_message VALUES (?, ?, ?, ?)''' - self._con.execute(sql, (jid_id, - kwargs.get('last_mam_id', None), - kwargs.get('oldest_mam_timestamp', None), - kwargs.get('last_muc_timestamp', None))) + self._con.execute(sql, ( + jid_id, + kwargs.get('last_mam_id', None), + kwargs.get('oldest_mam_timestamp', None), + kwargs.get('last_muc_timestamp', None))) else: args = ' = ?, '.join(kwargs.keys()) + ' = ?' sql = '''UPDATE last_archive_message SET {} ===================================== gajim/common/modules/mam.py ===================================== --- a/gajim/common/modules/mam.py +++ b/gajim/common/modules/mam.py @@ -47,6 +47,9 @@ class MAM: self.archiving_namespace = None self._mam_query_ids = {} + # Holds archive jids where catch up was successful + self._catch_up_finished = [] + def pass_disco(self, from_, identities, features, data, node): if nbxmpp.NS_MAM_2 in features: self.archiving_namespace = nbxmpp.NS_MAM_2 @@ -369,6 +372,9 @@ class MAM: start_date = datetime.utcnow() - timedelta(days=7) log.info('First start: query archive start: %s', start_date) query = self._get_archive_query(query_id, start=start_date) + + if own_jid in self._catch_up_finished: + self._catch_up_finished.remove(own_jid) self._send_archive_query(query, query_id, start_date) def request_archive_on_muc_join(self, jid): @@ -388,6 +394,9 @@ class MAM: start_date = datetime.utcnow() - timedelta(days=1) log.info('First join: query archive %s from: %s', jid, start_date) query = self._get_archive_query(query_id, jid=jid, start=start_date) + + if jid in self._catch_up_finished: + self._catch_up_finished.remove(jid) self._send_archive_query(query, query_id, start_date, groupchat=True) def _send_archive_query(self, query, query_id, start_date=None, @@ -408,11 +417,13 @@ class MAM: last = set_.getTagData('last') if last is None: log.info('End of MAM query, no items retrieved') + self._catch_up_finished.append(jid) self._mam_query_ids.pop(jid) return complete = fin.getAttr('complete') - app.logger.set_archive_timestamp(jid, last_mam_id=last) + app.logger.set_archive_timestamp( + jid, last_mam_id=last, last_muc_timestamp=None) if complete != 'true': self._mam_query_ids.pop(jid) query_id = self._get_query_id(jid) @@ -425,6 +436,8 @@ class MAM: jid, last_mam_id=last, oldest_mam_timestamp=start_date.timestamp()) + + self._catch_up_finished.append(jid) log.info('End of MAM query, last mam id: %s', last) def request_archive_interval(self, start_date, end_date, after=None, @@ -517,6 +530,17 @@ class MAM: query.setAttr('queryid', query_id) return iq + def save_archive_id(self, jid, stanza_id, timestamp): + if stanza_id is None: + return + if jid is None: + jid = self._con.get_own_jid().getStripped() + if jid not in self._catch_up_finished: + return + log.info('Save: %s: %s, %s', jid, stanza_id, timestamp) + app.logger.set_archive_timestamp( + jid, last_mam_id=stanza_id, last_muc_timestamp=timestamp) + def request_mam_preferences(self): log.info('Request MAM preferences') iq = nbxmpp.Iq('get', self.archiving_namespace) ===================================== gajim/common/modules/message.py ===================================== --- a/gajim/common/modules/message.py +++ b/gajim/common/modules/message.py @@ -109,8 +109,8 @@ class Message: jid, resource = app.get_room_and_nick_from_fjid(fjid) # Check for duplicates - unique_id = self._get_unique_id(stanza, forwarded, sent, - self_message, muc_pm) + stanza_id, origin_id = self._get_unique_id( + stanza, forwarded, sent, self_message, muc_pm) # Check groupchat messages for duplicates, # We do this because of MUC History messages @@ -121,8 +121,9 @@ class Message: archive_jid = self._con.get_own_jid().getStripped() if app.logger.find_stanza_id(self._account, archive_jid, - unique_id, - groupchat=type_ == 'groupchat'): + stanza_id, + origin_id, + type_ == 'groupchat'): return thread_id = stanza.getThread() @@ -177,7 +178,8 @@ class Message: 'fjid': fjid, 'jid': jid, 'resource': resource, - 'unique_id': unique_id, + 'stanza_id': stanza_id, + 'unique_id': stanza_id or origin_id, 'mtype': type_, 'msgtxt': msgtxt, 'thread_id': thread_id, @@ -215,7 +217,6 @@ class Message: 'form_node': parse_form(event.stanza), 'xhtml': parse_xhtml(event.stanza), 'chatstate': parse_chatstate(event.stanza), - 'stanza_id': event.unique_id } parse_oob(event.stanza, event.additional_data) @@ -235,7 +236,7 @@ class Message: None, conn=self._con, msg_obj=event, - stanza_id=event.unique_id)) + stanza_id=event.stanza_id)) return app.nec.push_incoming_event( @@ -245,30 +246,19 @@ class Message: def _get_unique_id(self, stanza, forwarded, sent, self_message, muc_pm): if stanza.getType() == 'groupchat': # TODO: Disco the MUC check if 'urn:xmpp:mam:2' is announced - return self._get_stanza_id(stanza) + return self._get_stanza_id(stanza), None if stanza.getType() != 'chat': - return + return None, None # Messages we receive live if self._con.get_module('MAM').archiving_namespace != nbxmpp.NS_MAM_2: # Only mam:2 ensures valid stanza-id - return + return None, None - if forwarded: - if sent: - if self_message or muc_pm: - return stanza.getOriginID() - return self._get_stanza_id(stanza) - else: - if muc_pm: - return stanza.getOriginID() - return self._get_stanza_id(stanza) - - # Normal Message - if self_message or muc_pm: - return stanza.getOriginID() - return self._get_stanza_id(stanza) + if self_message: + return self._get_stanza_id(stanza), stanza.getOriginID() + return self._get_stanza_id(stanza), None def _get_stanza_id(self, stanza): stanza_id, by = stanza.getStanzaIDAttrs() ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -139,6 +139,9 @@ class ChatControlSession(object): additional_data=obj.additional_data, stanza_id=obj.unique_id) + self.conn.get_module('MAM').save_archive_id( + None, obj.stanza_id, obj.timestamp) + if obj.muc_pm and not obj.gc_control: # This is a carbon of a PM from a MUC we are not currently # joined. We log it silently without notification. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/137bf1f8311c2a244718c738a0963669e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/137bf1f8311c2a244718c738a0963669e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add missing bookmark dict entry
by Philipp Hörist 29 Jul '18

29 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dbf891e9 by Philipp Hörist at 2018-07-29T20:26:52Z Add missing bookmark dict entry - - - - - 1 changed file: - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -273,7 +273,8 @@ class Bookmarks: 'autojoin': autojoin, 'minimize': minimize, 'password': password, - 'nick': nick} + 'nick': nick, + 'print_status': None} self.store_bookmarks() app.nec.push_incoming_event(BookmarksReceivedEvent( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dbf891e97c915ccd4562a0979382829310… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dbf891e97c915ccd4562a0979382829310… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add lost server discovery query
by Philipp Hörist 29 Jul '18

29 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 394d38e6 by Philipp Hörist at 2018-07-29T20:16:06Z Add lost server discovery query - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1456,6 +1456,7 @@ class Connection(CommonConnection, ConnectionHandlers): # This starts the connect_machine self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() + self.get_module('Discovery').discover_server_items() self.sm.resuming = False # back to previous state # Discover Stun server(s) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/394d38e663098199bcef6f9340337df3ab… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/394d38e663098199bcef6f9340337df3ab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Reset connect_maschine after disconnect on purpose
by Philipp Hörist 29 Jul '18

29 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 80aee95f by Philipp Hörist at 2018-07-29T17:35:45Z Reset connect_maschine after disconnect on purpose - - - - - 1 changed file: - gajim/common/modules/discovery.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== --- a/gajim/common/modules/discovery.py +++ b/gajim/common/modules/discovery.py @@ -179,6 +179,7 @@ class Discovery: self._con.get_module('PubSub').pass_disco(from_, *args) def discover_server_info(self): + # Calling this method starts the connect_maschine() server = self._con.get_own_jid().getDomain() self.disco_info(server, success_cb=self._server_info_received) @@ -199,7 +200,7 @@ class Discovery: if nbxmpp.NS_ADDRESS in features: self._con.addressing_supported = True - self._con.connect_machine() + self._con.connect_machine(restart=True) def _parse_transports(self, from_, identities, features, data, node): for identity in identities: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/80aee95f2ec38dfea321adbfc8c0161f49… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/80aee95f2ec38dfea321adbfc8c0161f49… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix creating metacontacts
by Philipp Hörist 29 Jul '18

29 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 68bd3abb by Philipp Hörist at 2018-07-29T14:23:30Z Fix creating metacontacts - We call finish() in on_drop_in_group() and on_drop_in_contact(), so dont do it in drag_drop() - Fix singal names - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -4324,10 +4324,10 @@ class RosterWindow: context.finish(True, True, etime) def drag_drop(self, treeview, context, x, y, timestamp): + treeview.stop_emission_by_name('drag-drop') target_list = treeview.drag_dest_get_target_list() target = treeview.drag_dest_find_target(context, target_list) - treeview.drag_get_data(context, target, 0) - context.finish(False, True, 0) + treeview.drag_get_data(context, target, timestamp) return True def move_group(self, old_name, new_name, account): @@ -4338,7 +4338,7 @@ class RosterWindow: def drag_data_received_data(self, treeview, context, x, y, selection, info, etime): - treeview.stop_emission_by_name('drag_data_received') + treeview.stop_emission_by_name('drag-data-received') drop_info = treeview.get_dest_row_at_pos(x, y) if not drop_info: return @@ -5843,11 +5843,11 @@ class RosterWindow: dst_targets.add_text_targets(0) dst_targets.add_uri_targets(self.TARGET_TYPE_URI_LIST) self.tree.drag_dest_set_target_list(dst_targets) - self.tree.connect('drag_begin', self.drag_begin) - self.tree.connect('drag_end', self.drag_end) - self.tree.connect('drag_drop', self.drag_drop) - self.tree.connect('drag_data_get', self.drag_data_get_data) - self.tree.connect('drag_data_received', self.drag_data_received_data) + self.tree.connect('drag-begin', self.drag_begin) + self.tree.connect('drag-end', self.drag_end) + self.tree.connect('drag-drop', self.drag_drop) + self.tree.connect('drag-data-get', self.drag_data_get_data) + self.tree.connect('drag-data-received', self.drag_data_received_data) self.dragging = False self.xml.connect_signals(self) self.combobox_callback_active = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/68bd3abbcee7575bf8d8c01b1ef09f0f8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/68bd3abbcee7575bf8d8c01b1ef09f0f8f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont idle draw avatars and pep images
by Philipp Hörist 29 Jul '18

29 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4686bcb8 by Philipp Hörist at 2018-07-29T10:16:41Z Dont idle draw avatars and pep images The model is detached from the treeview at start, so put all avatars into the model before we attach it again. Only draw PEP images when we receiv them. We dont save them to the database so it makes no sense to try and draw them on start. - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -396,10 +396,12 @@ class RosterWindow: # Do not confuse get_contact_iter: Sync groups of family members contact.groups = big_brother_contact.groups[:] + image = self._get_avatar_image(account, contact.jid) + for child_iter in parent_iters: it = self.model.append(child_iter, [None, contact.get_shown_name(), 'contact', contact.jid, account, - None, None, None, None, None, None, visible] + \ + None, None, None, None, image, None, visible] + \ [None] * self.nb_ext_renderers) added_iters.append(it) if contact.jid in self._iters[account]['contacts']: @@ -424,11 +426,13 @@ class RosterWindow: else: typestr = 'contact' + image = self._get_avatar_image(account, contact.jid) + # we add some values here. see draw_contact # for more i_ = self.model.append(child_iterG, [None, contact.get_shown_name(), typestr, contact.jid, account, - None, None, None, None, None, None, visible] + \ + None, None, None, None, image, None, visible] + \ [None] * self.nb_ext_renderers) added_iters.append(i_) if contact.jid in self._iters[account]['contacts']: @@ -1399,16 +1403,21 @@ class RosterWindow: for child_iter in iters: self.model[child_iter][model_column] = pixbuf + def _get_avatar_image(self, account, jid): + if not app.config.get('show_avatars_in_roster'): + return None + scale = self.window.get_scale_factor() + surface = app.contacts.get_avatar( + account, jid, AvatarSize.ROSTER, scale) + return Gtk.Image.new_from_surface(surface) + def draw_avatar(self, jid, account): iters = self._get_contact_iter(jid, account, model=self.model) if not iters or not app.config.get('show_avatars_in_roster'): return jid = self.model[iters[0]][Column.JID] + image = self._get_avatar_image(account, jid) - scale = self.window.get_scale_factor() - surface = app.contacts.get_avatar( - account, jid, AvatarSize.ROSTER, scale) - image = Gtk.Image.new_from_surface(surface) for child_iter in iters: self.model[child_iter][Column.AVATAR_IMG] = image return False @@ -1417,10 +1426,10 @@ class RosterWindow: contact_instances = app.contacts.get_contacts(account, jid) contact = app.contacts.get_highest_prio_contact_from_contacts( contact_instances) - self.draw_contact(jid, account, contact_instances=contact_instances, + self.draw_contact( + jid, account, + contact_instances=contact_instances, contact=contact) - self.draw_all_pep_types(jid, account, contact=contact) - self.draw_avatar(jid, account) def adjust_and_draw_contact_context(self, jid, account): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4686bcb8ca39f88170a268c4df70cb4a7e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4686bcb8ca39f88170a268c4df70cb4a7e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo
by Philipp Hörist 28 Jul '18

28 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7584037f by Philipp Hörist at 2018-07-28T11:32:37Z Fix typo - - - - - 6 changed files: - gajim/common/connection.py - gajim/common/helpers.py - gajim/common/modules/delimiter.py - gajim/common/modules/discovery.py - gajim/common/modules/metacontacts.py - gajim/common/modules/roster.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -123,8 +123,8 @@ class CommonConnection: self.awaiting_cids = {} # Used for XEP-0231 - # Tracks the calls of the connect_maschine() method - self._connect_maschine_calls = 0 + # Tracks the calls of the connect_machine() method + self._connect_machine_calls = 0 self.get_config_values_or_default() @@ -1453,7 +1453,7 @@ class Connection(CommonConnection, ConnectionHandlers): # If we are not resuming, we ask for discovery info # and archiving preferences if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): - # This starts the connect_maschine + # This starts the connect_machine self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() @@ -1470,15 +1470,15 @@ class Connection(CommonConnection, ConnectionHandlers): self._stun_servers = self._hosts = [i for i in result_array] @helpers.call_counter - def connect_maschine(self, restart=False): - log.info('Connect maschine state: %s', self._connect_maschine_calls) - if self._connect_maschine_calls == 1: + def connect_machine(self, restart=False): + log.info('Connect machine state: %s', self._connect_machine_calls) + if self._connect_machine_calls == 1: self.get_module('MetaContacts').get_metacontacts() - elif self._connect_maschine_calls == 2: + elif self._connect_machine_calls == 2: self.get_module('Delimiter').get_roster_delimiter() - elif self._connect_maschine_calls == 3: + elif self._connect_machine_calls == 3: self.get_module('Roster').request_roster() - elif self._connect_maschine_calls == 4: + elif self._connect_machine_calls == 4: self.send_first_presence() def send_custom_status(self, show, msg, jid): ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1512,7 +1512,7 @@ def get_emoticon_theme_path(theme): def call_counter(func): def helper(self, restart=False): if restart: - self._connect_maschine_calls = 0 - self._connect_maschine_calls += 1 + self._connect_machine_calls = 0 + self._connect_machine_calls += 1 return func(self, restart=False) return helper ===================================== gajim/common/modules/delimiter.py ===================================== --- a/gajim/common/modules/delimiter.py +++ b/gajim/common/modules/delimiter.py @@ -51,7 +51,7 @@ class Delimiter: else: self.set_roster_delimiter() - self._con.connect_maschine() + self._con.connect_machine() def set_roster_delimiter(self): log.info('Set delimiter') ===================================== gajim/common/modules/discovery.py ===================================== --- a/gajim/common/modules/discovery.py +++ b/gajim/common/modules/discovery.py @@ -199,7 +199,7 @@ class Discovery: if nbxmpp.NS_ADDRESS in features: self._con.addressing_supported = True - self._con.connect_maschine() + self._con.connect_machine() def _parse_transports(self, from_, identities, features, data, node): for identity in identities: ===================================== gajim/common/modules/metacontacts.py ===================================== --- a/gajim/common/modules/metacontacts.py +++ b/gajim/common/modules/metacontacts.py @@ -53,7 +53,7 @@ class MetaContacts: app.nec.push_incoming_event(NetworkEvent( 'metacontacts-received', conn=self._con, meta_list=meta_list)) - self._con.connect_maschine() + self._con.connect_machine() @staticmethod def _parse_metacontacts(stanza): ===================================== gajim/common/modules/roster.py ===================================== --- a/gajim/common/modules/roster.py +++ b/gajim/common/modules/roster.py @@ -104,7 +104,7 @@ class Roster: roster=self._data.copy(), received_from_server=received_from_server)) - self._con.connect_maschine() + self._con.connect_machine() def _roster_push_received(self, con, stanza): log.info('Push received') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7584037fc7cbd92daee71d0ea87deb5857… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7584037fc7cbd92daee71d0ea87deb5857… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve speed of loading roster
by Philipp Hörist 28 Jul '18

28 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b913d274 by Philipp Hörist at 2018-07-28T11:23:49Z Improve speed of loading roster - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2603,7 +2603,7 @@ class RosterWindow: def _nec_roster_received(self, obj): if obj.received_from_server: self.fill_contacts_and_groups_dicts(obj.roster, obj.conn.name) - self.add_account_contacts(obj.conn.name, improve_speed=False) + self.add_account_contacts(obj.conn.name) self.fire_up_unread_messages_events(obj.conn.name) else: # add self contact View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b913d2745b454010a38fb9913d09835eb8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b913d2745b454010a38fb9913d09835eb8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add connect_maschine()
by Philipp Hörist 27 Jul '18

27 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5a6f03de by Philipp Hörist at 2018-07-27T14:01:10Z Add connect_maschine() Add method that sequentially works the steps we have to do before sending first presence - Move Delimiter into own module - Move Metacontacts into own module - - - - - 2f3d50b1 by Philipp Hörist at 2018-07-27T14:16:23Z Fix restoring open chatcontrols after restart - - - - - 18 changed files: - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - gajim/common/modules/bookmarks.py - + gajim/common/modules/delimiter.py - gajim/common/modules/discovery.py - + gajim/common/modules/metacontacts.py - gajim/common/modules/roster.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/groupchat_control.py - gajim/gtk/join_groupchat.py - gajim/roster_window.py - gajim/statusicon.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -415,7 +415,9 @@ def account_is_zeroconf(account): return connections[account].is_zeroconf def account_supports_private_storage(account): - return connections[account].private_storage_supported + # If Delimiter module is not available we can assume + # Private Storage is not available + return connections[account].get_module('Delimiter').available def account_is_connected(account): if account not in connections: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -115,7 +115,6 @@ class CommonConnection: # the fake jid self.groupchat_jids = {} # {ID : groupchat_jid} - self.private_storage_supported = False self.roster_supported = True self.addressing_supported = False @@ -124,7 +123,8 @@ class CommonConnection: self.awaiting_cids = {} # Used for XEP-0231 - self.nested_group_delimiter = '::' + # Tracks the calls of the connect_maschine() method + self._connect_maschine_calls = 0 self.get_config_values_or_default() @@ -412,12 +412,6 @@ class CommonConnection: def account_changed(self, new_name): self.name = new_name - def get_metacontacts(self): - """ - To be implemented by derived classes - """ - raise NotImplementedError - def send_agent_status(self, agent, ptype): """ To be implemented by derived classes @@ -546,8 +540,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.retrycount = 0 self.available_transports = {} # list of available transports on this # server {'icq': ['icq.server.com', 'icq2.server.com'], } - self.private_storage_supported = True - self.privacy_rules_requested = False + self.streamError = '' self.secret_hmac = str(random.random())[2:].encode('utf-8') self.removing_account = False @@ -644,7 +637,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.on_purpose = on_purpose self.connected = 0 self.time_to_reconnect = None - self.get_module('PrivacyLists').supported = False self.get_module('VCardAvatars').avatar_advertised = False if on_purpose: self.sm = Smacks(self) @@ -1427,6 +1419,9 @@ class Connection(CommonConnection, ConnectionHandlers): # Get annotations self.get_module('Annotations').get_annotations() + # Blocking + self.get_module('Blocking').get_blocking_list() + # Inform GUI we just signed in app.nec.push_incoming_event(SignedInEvent(None, conn=self)) @@ -1455,60 +1450,39 @@ class Connection(CommonConnection, ConnectionHandlers): self.pingalives, self.get_module('Ping').send_keepalive_ping) self.connection.onreceive(None) - self.privacy_rules_requested = False - # If we are not resuming, we ask for discovery info # and archiving preferences if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): - our_server = app.config.get_per('accounts', self.name, 'hostname') - self.get_module('Discovery').discover_account_info() + # This starts the connect_maschine self.get_module('Discovery').discover_server_info() - else: - self.request_roster(resume=True) + self.get_module('Discovery').discover_account_info() - self.sm.resuming = False # back to previous state + self.sm.resuming = False # back to previous state # Discover Stun server(s) if self._proxy is None: hostname = app.config.get_per('accounts', self.name, 'hostname') - app.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii(hostname), - self._on_stun_resolved) + app.resolver.resolve( + '_stun._udp.' + helpers.idn_to_ascii(hostname), + self._on_stun_resolved) def _on_stun_resolved(self, host, result_array): if len(result_array) != 0: self._stun_servers = self._hosts = [i for i in result_array] - def _continue_connection_request_privacy(self): - if self.get_module('PrivacyLists').supported: - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self.get_module('PrivacyLists').get_privacy_lists( - self._received_privacy) - else: - # Privacy lists not supported - log.info('Privacy Lists not supported') - self._received_privacy(False) - - def _received_privacy(self, result): - if not result: - if (self.continue_connect_info and - self.continue_connect_info[0] == 'invisible'): - # Trying to login as invisible but privacy list not - # supported - self.disconnect(on_purpose=True) - app.nec.push_incoming_event(OurShowEvent( - None, conn=self, show='offline')) - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='invisibility-not-supported', - args=self.name)) - return - - self.get_module('Blocking').get_blocking_list() - - # Ask metacontacts before roster - self.get_metacontacts() + @helpers.call_counter + def connect_maschine(self, restart=False): + log.info('Connect maschine state: %s', self._connect_maschine_calls) + if self._connect_maschine_calls == 1: + self.get_module('MetaContacts').get_metacontacts() + elif self._connect_maschine_calls == 2: + self.get_module('Delimiter').get_roster_delimiter() + elif self._connect_maschine_calls == 3: + self.get_module('Roster').request_roster() + elif self._connect_maschine_calls == 4: + self.send_first_presence() def send_custom_status(self, show, msg, jid): - if not show in app.SHOW_LIST: + if show not in app.SHOW_LIST: return -1 if not app.account_is_connected(self.name): return @@ -1677,85 +1651,9 @@ class Connection(CommonConnection, ConnectionHandlers): query.setTagData('prompt', prompt) self.connection.SendAndCallForResponse(iq, _on_prompt_result) - def bookmarks_available(self): - if self.private_storage_supported: - return True - if self.get_module('PubSub').publish_options: - return True - return False - - def get_roster_delimiter(self): - """ - Get roster group delimiter from storage as described in XEP 0083 - """ - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq2.addChild(name='roster', namespace='roster:delimiter') - id_ = self.connection.getAnID() - iq.setID(id_) - self.awaiting_answers[id_] = (DELIMITER_ARRIVED, ) - self.connection.send(iq) - - def set_roster_delimiter(self, delimiter='::'): - """ - Set roster group delimiter to the storage namespace - """ - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='set') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq3 = iq2.addChild(name='roster', namespace='roster:delimiter') - iq3.setData(delimiter) - - self.connection.send(iq) - - def get_metacontacts(self): - """ - Get metacontacts list from storage as described in XEP 0049 - """ - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq2.addChild(name='storage', namespace='storage:metacontacts') - id_ = self.connection.getAnID() - iq.setID(id_) - self.awaiting_answers[id_] = (METACONTACTS_ARRIVED, ) - self.connection.send(iq) - - def store_metacontacts(self, tags_list): - """ - Send meta contacts to the storage namespace - """ - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='set') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq3 = iq2.addChild(name='storage', namespace='storage:metacontacts') - for tag in tags_list: - for data in tags_list[tag]: - jid = data['jid'] - dict_ = {'jid': jid, 'tag': tag} - if 'order' in data: - dict_['order'] = data['order'] - iq3.addChild(name='meta', attrs=dict_) - self.connection.send(iq) - def getRoster(self): return self.get_module('Roster') - def request_roster(self, resume=False): - version = None - features = self.connection.Dispatcher.Stream.features - if features and features.getTag('ver', namespace=nbxmpp.NS_ROSTER_VER): - version = app.config.get_per( - 'accounts', self.name, 'roster_version') - - if not resume: - self.get_module('Roster').request_roster(version) - def send_agent_status(self, agent, ptype): if not app.account_is_connected(self.name): return ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -53,10 +53,6 @@ log = logging.getLogger('gajim.c.connection_handlers') # kind of events we can wait for an answer AGENT_REMOVED = 'agent_removed' -METACONTACTS_ARRIVED = 'metacontacts_arrived' -ROSTER_ARRIVED = 'roster_arrived' -DELIMITER_ARRIVED = 'delimiter_arrived' -PRIVACY_ARRIVED = 'privacy_arrived' class ConnectionDisco: @@ -518,35 +514,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, app.nec.push_incoming_event(AgentRemovedEvent(None, conn=self, agent=jid)) del self.awaiting_answers[id_] - elif self.awaiting_answers[id_][0] == METACONTACTS_ARRIVED: - if not self.connection: - return - if iq_obj.getType() == 'result': - app.nec.push_incoming_event(MetacontactsReceivedEvent(None, - conn=self, stanza=iq_obj)) - else: - if iq_obj.getErrorCode() not in ('403', '406', '404'): - self.private_storage_supported = False - self.get_roster_delimiter() - del self.awaiting_answers[id_] - elif self.awaiting_answers[id_][0] == DELIMITER_ARRIVED: - del self.awaiting_answers[id_] - if not self.connection: - return - if iq_obj.getType() == 'result': - query = iq_obj.getTag('query') - if not query: - return - delimiter = query.getTagData('roster') - if delimiter: - self.nested_group_delimiter = delimiter - else: - self.set_roster_delimiter('::') - else: - self.private_storage_supported = False - - # We can now continue connection by requesting the roster - self.request_roster() def _dispatch_gc_msg_with_captcha(self, stanza, msg_obj): msg_obj.stanza = stanza ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -852,37 +852,6 @@ class UpdateRoomAvatarEvent(nec.NetworkIncomingEvent): def generate(self): return True -class MetacontactsReceivedEvent(nec.NetworkIncomingEvent): - name = 'metacontacts-received' - base_network_events = [] - - def generate(self): - # Metacontact tags - # http://www.xmpp.org/extensions/xep-0209.html - self.meta_list = {} - query = self.stanza.getTag('query') - storage = query.getTag('storage') - metas = storage.getTags('meta') - for meta in metas: - try: - jid = helpers.parse_jid(meta.getAttr('jid')) - except helpers.InvalidFormat: - continue - tag = meta.getAttr('tag') - data = {'jid': jid} - order = meta.getAttr('order') - try: - order = int(order) - except Exception: - order = 0 - if order is not None: - data['order'] = order - if tag in self.meta_list: - self.meta_list[tag].append(data) - else: - self.meta_list[tag] = [data] - return True - class ZeroconfNameConflictEvent(nec.NetworkIncomingEvent): name = 'zeroconf-name-conflict' base_network_events = [] ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -732,8 +732,9 @@ class MetacontactManager(): self._metacontacts_tags[brother_account][tag] = [{'jid': brother_jid, 'tag': tag}] if brother_account != account: - common.app.connections[brother_account].store_metacontacts( - self._metacontacts_tags[brother_account]) + con = common.app.connections[brother_account] + con.get_module('MetaContacts').store_metacontacts( + self._metacontacts_tags[brother_account]) # be sure jid has no other tag old_tag = self._get_metacontacts_tag(account, jid) while old_tag: @@ -748,11 +749,12 @@ class MetacontactManager(): else: self._metacontacts_tags[account][tag].append({'jid': jid, 'tag': tag}) - common.app.connections[account].store_metacontacts( - self._metacontacts_tags[account]) + con = common.app.connections[account] + con.get_module('MetaContacts').store_metacontacts( + self._metacontacts_tags[account]) def remove_metacontact(self, account, jid): - if not account in self._metacontacts_tags: + if account not in self._metacontacts_tags: return found = None @@ -763,8 +765,9 @@ class MetacontactManager(): break if found: self._metacontacts_tags[account][tag].remove(found) - common.app.connections[account].store_metacontacts( - self._metacontacts_tags[account]) + con = common.app.connections[account] + con.get_module('MetaContacts').store_metacontacts( + self._metacontacts_tags[account]) break def has_brother(self, account, jid, accounts): ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1508,3 +1508,11 @@ def get_emoticon_theme_path(theme): emoticons_user_path = os.path.join(configpaths.get('MY_EMOTS'), theme) if os.path.exists(emoticons_user_path): return emoticons_user_path + +def call_counter(func): + def helper(self, restart=False): + if restart: + self._connect_maschine_calls = 0 + self._connect_maschine_calls += 1 + return func(self, restart=False) + return helper ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -43,7 +43,7 @@ class ModuleMock: def __init__(self, name): self._name = name - # HTTPUpload + # HTTPUpload, .. self.available = False # Blocking @@ -54,6 +54,9 @@ class ModuleMock: self.blocked_groups = [] self.blocked_all = False + # Delimiter + self.delimiter = '::' + # Bookmarks self.bookmarks = {} ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -31,6 +31,7 @@ class Bookmarks: self._con = con self._account = con.name self.bookmarks = {} + self.available = False self.handlers = [] @@ -65,6 +66,7 @@ class Bookmarks: self._request_private_bookmarks() return + self.available = True log.info('Received Bookmarks (PubSub)') self._parse_bookmarks(stanza) self._request_private_bookmarks() @@ -84,6 +86,7 @@ class Bookmarks: if not nbxmpp.isResultNode(stanza): log.info('No private bookmarks: %s', stanza.getError()) else: + self.available = True log.info('Received Bookmarks (PrivateStorage)') merged = self._parse_bookmarks(stanza, check_merge=True) if merged and self._pubsub_support(): ===================================== gajim/common/modules/delimiter.py ===================================== --- /dev/null +++ b/gajim/common/modules/delimiter.py @@ -0,0 +1,71 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0083: Nested Roster Groups + +import logging + +import nbxmpp + +log = logging.getLogger('gajim.c.m.delimiter') + + +class Delimiter: + def __init__(self, con): + self._con = con + self._account = con.name + self.available = False + + self.delimiter = '::' + + self.handlers = [] + + def get_roster_delimiter(self): + log.info('Request') + node = nbxmpp.Node('storage', attrs={'xmlns': 'roster:delimiter'}) + iq = nbxmpp.Iq('get', nbxmpp.NS_PRIVATE, payload=node) + + self._con.connection.SendAndCallForResponse( + iq, self._delimiter_received) + + def _delimiter_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Request error: %s', stanza.getError()) + else: + delimiter = stanza.getQuery().getTagData('roster') + self.available = True + log.info('Delimiter received: %s', delimiter) + if delimiter: + self.delimiter = delimiter + else: + self.set_roster_delimiter() + + self._con.connect_maschine() + + def set_roster_delimiter(self): + log.info('Set delimiter') + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVATE) + roster = iq.getQuery().addChild('roster', namespace='roster:delimiter') + roster.setData('::') + + self._con.connection.SendAndCallForResponse( + iq, self._set_delimiter_response) + + def _set_delimiter_response(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Store error: %s', stanza.getError()) + + +def get_instance(*args, **kwargs): + return Delimiter(*args, **kwargs), 'Delimiter' ===================================== gajim/common/modules/discovery.py ===================================== --- a/gajim/common/modules/discovery.py +++ b/gajim/common/modules/discovery.py @@ -199,7 +199,7 @@ class Discovery: if nbxmpp.NS_ADDRESS in features: self._con.addressing_supported = True - self._con._continue_connection_request_privacy() + self._con.connect_maschine() def _parse_transports(self, from_, identities, features, data, node): for identity in identities: ===================================== gajim/common/modules/metacontacts.py ===================================== --- /dev/null +++ b/gajim/common/modules/metacontacts.py @@ -0,0 +1,107 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# XEP-0209: Metacontacts + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common import helpers +from gajim.common.nec import NetworkEvent + +log = logging.getLogger('gajim.c.m.metacontacts') + + +class MetaContacts: + def __init__(self, con): + self._con = con + self._account = con.name + self.available = False + + self.handlers = [] + + def get_metacontacts(self): + log.info('Request') + node = nbxmpp.Node('storage', attrs={'xmlns': 'storage:metacontacts'}) + iq = nbxmpp.Iq('get', nbxmpp.NS_PRIVATE, payload=node) + + self._con.connection.SendAndCallForResponse( + iq, self._metacontacts_received) + + def _metacontacts_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Request error: %s', stanza.getError()) + else: + self.available = True + meta_list = self._parse_metacontacts(stanza) + + log.info('Received: %s', meta_list) + + app.nec.push_incoming_event(NetworkEvent( + 'metacontacts-received', conn=self._con, meta_list=meta_list)) + + self._con.connect_maschine() + + @staticmethod + def _parse_metacontacts(stanza): + meta_list = {} + query = stanza.getQuery() + storage = query.getTag('storage') + metas = storage.getTags('meta') + for meta in metas: + try: + jid = helpers.parse_jid(meta.getAttr('jid')) + except helpers.InvalidFormat: + continue + tag = meta.getAttr('tag') + data = {'jid': jid} + order = meta.getAttr('order') + try: + order = int(order) + except Exception: + order = 0 + if order is not None: + data['order'] = order + if tag in meta_list: + meta_list[tag].append(data) + else: + meta_list[tag] = [data] + return meta_list + + def store_metacontacts(self, tags_list): + if not app.account_is_connected(self._account): + return + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVATE) + meta = iq.getQuery().addChild('storage', + namespace='storage:metacontacts') + for tag in tags_list: + for data in tags_list[tag]: + jid = data['jid'] + dict_ = {'jid': jid, 'tag': tag} + if 'order' in data: + dict_['order'] = data['order'] + meta.addChild(name='meta', attrs=dict_) + log.info('Store: %s', tags_list) + self._con.connection.SendAndCallForResponse( + iq, self._store_response_received) + + def _store_response_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Store error: %s', stanza.getError()) + + +def get_instance(*args, **kwargs): + return MetaContacts(*args, **kwargs), 'MetaContacts' ===================================== gajim/common/modules/roster.py ===================================== --- a/gajim/common/modules/roster.py +++ b/gajim/common/modules/roster.py @@ -24,10 +24,6 @@ from gajim.common.nec import NetworkEvent log = logging.getLogger('gajim.c.m.roster') - -# TODO: Error IQs -# What if roster not supported on server -> error - RosterItem = namedtuple('RosterItem', 'jid data') @@ -65,7 +61,19 @@ class Roster: app.config.set_per( 'accounts', self._account, 'roster_version', '') - def request_roster(self, version): + app.nec.push_incoming_event(NetworkEvent( + 'roster-received', + conn=self._con, + roster=self._data.copy(), + received_from_server=False)) + + def request_roster(self): + version = None + features = self._con.connection.Dispatcher.Stream.features + if features and features.getTag('ver', namespace=nbxmpp.NS_ROSTER_VER): + version = app.config.get_per( + 'accounts', self._account, 'roster_version') + log.info('Requested from server') iq = nbxmpp.Iq('get', nbxmpp.NS_ROSTER) if version is not None: @@ -77,27 +85,26 @@ class Roster: def _roster_received(self, stanza): if not nbxmpp.isResultNode(stanza): log.warning('Unable to retrive roster: %s', stanza.getError()) - return - - log.info('Received Roster') - received_from_server = False - if stanza.getTag('query') is not None: - # clear Roster - self._data = {} - version = self._parse_roster(stanza) + else: + log.info('Received Roster') + received_from_server = False + if stanza.getTag('query') is not None: + # clear Roster + self._data = {} + version = self._parse_roster(stanza) - log.info('New version: %s', version) - app.logger.replace_roster(self._account, version, self._data) + log.info('New version: %s', version) + app.logger.replace_roster(self._account, version, self._data) - received_from_server = True + received_from_server = True - app.nec.push_incoming_event(NetworkEvent( - 'roster-received', - conn=self._con, - roster=self._data.copy(), - received_from_server=received_from_server)) + app.nec.push_incoming_event(NetworkEvent( + 'roster-received', + conn=self._con, + roster=self._data.copy(), + received_from_server=received_from_server)) - self._con.send_first_presence() + self._con.connect_maschine() def _roster_push_received(self, con, stanza): log.info('Push received') ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_handlers_zeroconf.py +++ b/gajim/common/zeroconf/connection_handlers_zeroconf.py @@ -183,11 +183,3 @@ connection_handlers.ConnectionJingle): app.nec.push_incoming_event( DecryptedMessageReceivedEvent(None, **vars(event))) - - def store_metacontacts(self, tags): - """ - Fake empty method - """ - # serverside metacontacts are not supported with zeroconf - # (there is no server) - pass ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -592,7 +592,7 @@ class GroupchatControl(ChatControlBase): # Bookmarks con = app.connections[self.account] - bookmark_support = con.bookmarks_available() + bookmark_support = con.get_module('Bookmarks').available bookmarked = self.room_jid in con.get_module('Bookmarks').bookmarks win.lookup_action('bookmark-' + self.control_id).set_enabled( online and bookmark_support and not bookmarked) ===================================== gajim/gtk/join_groupchat.py ===================================== --- a/gajim/gtk/join_groupchat.py +++ b/gajim/gtk/join_groupchat.py @@ -111,7 +111,8 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Set bookmark switch sensitive if server supports bookmarks acc = self.account_combo.get_active_id() - if not app.connections[acc].private_storage_supported: + con = app.connections[acc] + if not con.get_module('Bookmarks').available: self.bookmark_switch.set_sensitive(False) self.autojoin_switch.set_sensitive(False) @@ -256,8 +257,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): def _add_bookmark(self, account, nickname, password): con = app.connections[account] - if not con.private_storage_supported: - return add_bookmark = self.bookmark_switch.get_active() if not add_bookmark: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -343,7 +343,7 @@ class RosterWindow: account_group = 'MERGED' else: account_group = account - delimiter = app.connections[account].nested_group_delimiter + delimiter = app.connections[account].get_module('Delimiter').delimiter group_splited = group.split(delimiter) parent_group = delimiter.join(group_splited[:-1]) if len(group_splited) > 1 and parent_group in self._iters[account_group]['groups']: @@ -1347,7 +1347,7 @@ class RosterWindow: self.draw_parent_contact(jid, account) if visible: - delimiter = app.connections[account].nested_group_delimiter + delimiter = app.connections[account].get_module('Delimiter').delimiter for group in contact.get_shown_groups(): group_splited = group.split(delimiter) i = 1 @@ -1600,7 +1600,7 @@ class RosterWindow: return if account not in app.connections: return - delimiter = app.connections[account].nested_group_delimiter + delimiter = app.connections[account].get_module('Delimiter').delimiter group_splited = group.split(delimiter) i = 1 while i < len(group_splited) + 1: @@ -4159,9 +4159,10 @@ class RosterWindow: def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): - - if not app.connections[account_source].private_storage_supported or \ - not app.connections[account_dest].private_storage_supported: + con_source = app.connections[account_source] + con_dest = app.connections[account_dest] + if (not con_source.get_module('MetaContacts').available or + not con_dest.get_module('MetaContacts').available): WarningDialog(_('Metacontacts storage not supported by ' 'your server'), _('Your server does not support storing metacontacts ' @@ -4433,7 +4434,7 @@ class RosterWindow: # drop on another account return grp_source = model[iter_source][Column.JID] - delimiter = app.connections[account_source].nested_group_delimiter + delimiter = app.connections[account_source].get_module('Delimiter').delimiter grp_source_list = grp_source.split(delimiter) new_grp = None if type_dest == 'account': ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -221,8 +221,6 @@ class StatusIcon: if connected_accounts < 1: item.set_sensitive(False) - connected_accounts_with_private_storage = 0 - item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) @@ -271,8 +269,6 @@ class StatusIcon: for account in app.connections: if app.account_is_connected(account) and \ not app.config.get_per('accounts', account, 'is_zeroconf'): - if app.connections[account].private_storage_supported: - connected_accounts_with_private_storage += 1 # for single message single_message_menuitem.set_submenu(None) @@ -296,8 +292,6 @@ class StatusIcon: if app.connections[account].is_zeroconf or \ not app.account_is_connected(account): continue - if app.connections[account].private_storage_supported: - connected_accounts_with_private_storage += 1 # for single message item = Gtk.MenuItem.new_with_label( _('using account %s') % account_label) @@ -320,9 +314,12 @@ class StatusIcon: newitem = Gtk.MenuItem.new_with_mnemonic(_('_Manage Bookmarks…')) newitem.connect('activate', app.interface.roster.on_manage_bookmarks_menuitem_activate) + newitem.set_sensitive(False) gc_sub_menu.append(newitem) - if connected_accounts_with_private_storage == 0: - newitem.set_sensitive(False) + for account in accounts_list: + if app.account_supports_private_storage(account): + newitem.set_sensitive(True) + break sounds_mute_menuitem.set_active(not app.config.get('sounds_on')) ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -21,7 +21,6 @@ class MockConnection(Mock, ConnectionHandlers): self.connected = 2 self.pep = {} self.sessions = {} - self.nested_group_delimiter = '::' self.server_resource = 'Gajim' app.interface.instances[account] = {'infos': {}, 'disco': {}, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/db77fa1aceb0364ad98521c38a5164997… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/db77fa1aceb0364ad98521c38a5164997… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add roster implementation to Gajim
by Philipp Hörist 26 Jul '18

26 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: db77fa1a by Philipp Hörist at 2018-07-26T18:38:00Z Add roster implementation to Gajim - - - - - 12 changed files: - gajim/accounts_window.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/modules/__init__.py - gajim/common/modules/presence.py - + gajim/common/modules/roster.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/common/zeroconf/roster_zeroconf.py - gajim/gui_interface.py - gajim/roster_window.py - gajim/tooltips.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -301,6 +301,8 @@ class AccountsWindow(Gtk.ApplicationWindow): app.interface.roster.regroup = app.config.get('mergeaccounts') else: app.interface.roster.regroup = False + app.config.set_per( + 'accounts', account, 'roster_version', '') app.interface.roster.setup_and_draw_roster() gui_menu_builder.build_accounts_menu() ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -387,15 +387,15 @@ class CommonConnection: raise NotImplementedError def update_contact(self, jid, name, groups): - if self.connection and self.roster_supported: - self.connection.getRoster().setItem(jid=jid, name=name, groups=groups) + if self.connection: + self.getRoster().setItem(jid=jid, name=name, groups=groups) def update_contacts(self, contacts): """ Update multiple roster items """ - if self.connection and self.roster_supported: - self.connection.getRoster().setItemMulti(contacts) + if self.connection: + self.getRoster().setItemMulti(contacts) def new_account(self, name, config, sync=False): """ @@ -443,10 +443,6 @@ class CommonConnection: return self.gpg.get_secret_keys() return None - def load_roster_from_db(self): - # Do nothing by default - return - def _event_dispatcher(self, realm, event, data): if realm == '': if event == 'STANZA_RECEIVED': @@ -1622,7 +1618,7 @@ class Connection(CommonConnection, ConnectionHandlers): iq.setID(id_) self.awaiting_answers[id_] = (AGENT_REMOVED, agent) self.connection.send(iq) - self.connection.getRoster().delItem(agent) + self.getRoster().delItem(agent) def send_new_account_infos(self, form, is_form): if is_form: @@ -1747,6 +1743,9 @@ class Connection(CommonConnection, ConnectionHandlers): iq3.addChild(name='meta', attrs=dict_) self.connection.send(iq) + def getRoster(self): + return self.get_module('Roster') + def request_roster(self, resume=False): version = None features = self.connection.Dispatcher.Stream.features @@ -1754,18 +1753,8 @@ class Connection(CommonConnection, ConnectionHandlers): version = app.config.get_per( 'accounts', self.name, 'roster_version') - iq_id = self.connection.initRoster(version=version, - request=not resume) - if resume: - self._init_roster_from_db() - else: - self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) - - def _init_roster_from_db(self): - account_jid = app.get_jid_from_account(self.name) - roster_data = app.logger.get_roster(account_jid) - roster = self.connection.getRoster(force=True) - roster.setRaw(roster_data) + if not resume: + self.get_module('Roster').request_roster(version) def send_agent_status(self, agent, ptype): if not app.account_is_connected(self.name): @@ -2056,8 +2045,3 @@ class Connection(CommonConnection, ConnectionHandlers): self.reconnect() else: self.time_to_reconnect = None - - def load_roster_from_db(self): - app.nec.push_incoming_event(RosterReceivedEvent(None, conn=self)) - -# END Connection ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -468,19 +468,11 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(NotificationEvent) - app.ged.register_event_handler('roster-set-received', - ged.CORE, self._nec_roster_set_received) - app.ged.register_event_handler('roster-received', ged.CORE, - self._nec_roster_received) app.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) def cleanup(self): ConnectionHandlersBase.cleanup(self) - app.ged.remove_event_handler('roster-set-received', - ged.CORE, self._nec_roster_set_received) - app.ged.remove_event_handler('roster-received', ged.CORE, - self._nec_roster_received) app.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) @@ -555,41 +547,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, # We can now continue connection by requesting the roster self.request_roster() - elif self.awaiting_answers[id_][0] == ROSTER_ARRIVED: - if iq_obj.getType() == 'result': - if not iq_obj.getTag('query'): - self._init_roster_from_db() - self._getRoster() - elif iq_obj.getType() == 'error': - self.roster_supported = False - self.get_module('Discovery').discover_server_items() - if app.config.get_per('accounts', self.name, - 'use_ft_proxies'): - self.discover_ft_proxies() - app.nec.push_incoming_event(RosterReceivedEvent(None, - conn=self)) - del self.awaiting_answers[id_] - - def _rosterSetCB(self, con, iq_obj): - log.debug('rosterSetCB') - app.nec.push_incoming_event(RosterSetReceivedEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_roster_set_received(self, obj): - if obj.conn.name != self.name: - return - for jid in obj.items: - item = obj.items[jid] - app.nec.push_incoming_event(RosterInfoEvent(None, conn=self, - jid=jid, nickname=item['name'], sub=item['sub'], - ask=item['ask'], groups=item['groups'])) - account_jid = app.get_jid_from_account(self.name) - app.logger.add_or_update_contact(account_jid, jid, item['name'], - item['sub'], item['ask'], item['groups']) - if obj.version: - app.config.set_per('accounts', self.name, 'roster_version', - obj.version) def _dispatch_gc_msg_with_captcha(self, stanza, msg_obj): msg_obj.stanza = stanza @@ -657,15 +614,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, # This way we'll really remove it app.to_be_removed[self.name].remove(jid) - def _getRoster(self): - log.debug('getRosterCB') - if not self.connection: - return - self.connection.getRoster(self._on_roster_set) - self.get_module('Discovery').discover_server_items() - if app.config.get_per('accounts', self.name, 'use_ft_proxies'): - self.discover_ft_proxies() - def discover_ft_proxies(self): cfg_proxies = app.config.get_per('accounts', self.name, 'file_transfer_proxies') @@ -679,15 +627,7 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, app.proxy65_manager.resolve(proxy, self.connection, our_jid, testit=testit) - def _on_roster_set(self, roster): - app.nec.push_incoming_event(RosterReceivedEvent(None, conn=self, - xmpp_roster=roster)) - - def _nec_roster_received(self, obj): - if obj.conn.name != self.name: - return - our_jid = app.get_jid_from_account(self.name) - + def send_first_presence(self): if self.connected > 1 and self.continue_connect_info: msg = self.continue_connect_info[1] sign_msg = self.continue_connect_info[2] @@ -705,20 +645,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, if send_first_presence: self._send_first_presence(signed) - app.logger.replace_roster(self.name, obj.version, obj.roster) - - for contact in app.contacts.iter_contacts(self.name): - if not contact.is_groupchat() and contact.jid not in obj.roster\ - and contact.jid != our_jid: - app.nec.push_incoming_event(RosterInfoEvent(None, - conn=self, jid=contact.jid, nickname=None, sub=None, - ask=None, groups=())) - for jid, info in obj.roster.items(): - app.nec.push_incoming_event(RosterInfoEvent(None, - conn=self, jid=jid, nickname=info['name'], - sub=info['subscription'], ask=info['ask'], - groups=info['groups'], avatar_sha=info['avatar_sha'])) - def _send_first_presence(self, signed=''): show = self.continue_connect_info[0] msg = self.continue_connect_info[1] @@ -786,7 +712,7 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class # that defines handlers - con.RegisterHandler('iq', self._rosterSetCB, 'set', nbxmpp.NS_ROSTER) + con.RegisterHandler('iq', self._siSetCB, 'set', nbxmpp.NS_SI) con.RegisterHandler('iq', self._siErrorCB, 'error', nbxmpp.NS_SI) con.RegisterHandler('iq', self._siResultCB, 'result', nbxmpp.NS_SI) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -179,93 +179,6 @@ class HelperEvent: self.muc_pm = muc_user.getChildren() == [] return self.muc_pm -class RosterReceivedEvent(nec.NetworkIncomingEvent): - name = 'roster-received' - base_network_events = [] - - def generate(self): - if hasattr(self, 'xmpp_roster'): - self.version = self.xmpp_roster.version - self.received_from_server = self.xmpp_roster.received_from_server - self.roster = {} - raw_roster = self.xmpp_roster.getRaw() - our_jid = app.get_jid_from_account(self.conn.name) - - for jid in raw_roster: - try: - j = helpers.parse_jid(jid) - except Exception: - print(_('JID %s is not RFC compliant. It will not be added ' - 'to your roster. Use roster management tools such as ' - 'http://jru.jabberstudio.org/ to remove it') % jid, - file=sys.stderr) - else: - infos = raw_roster[jid] - if jid != our_jid and (not infos['subscription'] or \ - infos['subscription'] == 'none') and (not infos['ask'] or \ - infos['ask'] == 'none') and not infos['name'] and \ - not infos['groups']: - # remove this useless item, it won't be shown in roster - # anyway - self.conn.connection.getRoster().delItem(jid) - elif jid != our_jid: # don't add our jid - self.roster[j] = raw_roster[jid] - self.roster[j]['avatar_sha'] = None - else: - # Roster comes from DB - self.received_from_server = False - self.version = app.config.get_per('accounts', self.conn.name, - 'roster_version') - self.roster = app.logger.get_roster(app.get_jid_from_account( - self.conn.name)) - if not self.roster: - app.config.set_per( - 'accounts', self.conn.name, 'roster_version', '') - return True - -class RosterSetReceivedEvent(nec.NetworkIncomingEvent): - name = 'roster-set-received' - base_network_events = [] - - def generate(self): - frm = self.stanza.getFrom() - our_jid = self.conn.get_own_jid() - if frm is not None and not frm.bareMatch(our_jid): - return - self.version = self.stanza.getTagAttr('query', 'ver') - self.items = {} - for item in self.stanza.getTag('query').getChildren(): - try: - jid = helpers.parse_jid(item.getAttr('jid')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % item.getAttr('jid')) - continue - name = item.getAttr('name') - sub = item.getAttr('subscription') - ask = item.getAttr('ask') - groups = [] - for group in item.getTags('group'): - groups.append(group.getData()) - self.items[jid] = {'name': name, 'sub': sub, 'ask': ask, - 'groups': groups} - if len(self.items) > 1: - reply = nbxmpp.Iq(typ='error', attrs={'id': self.stanza.getID()}, - to=self.stanza.getFrom(), frm=self.stanza.getTo(), xmlns=None) - self.conn.connection.send(reply) - return - if self.conn.connection and self.conn.connected > 1: - reply = nbxmpp.Iq(typ='result', attrs={'id': self.stanza.getID()}, - to=self.stanza.getFrom(), frm=self.stanza.getTo(), xmlns=None) - self.conn.connection.send(reply) - return True - -class RosterInfoEvent(nec.NetworkIncomingEvent): - name = 'roster-info' - base_network_events = [] - - def init(self): - self.avatar_sha = None - class IqErrorReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'iq-error-received' base_network_events = [] ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -15,6 +15,7 @@ import logging from importlib import import_module from pathlib import Path +from unittest.mock import MagicMock log = logging.getLogger('gajim.c.m') @@ -60,9 +61,7 @@ class ModuleMock: self.supported = False def __getattr__(self, key): - def _mock(self, *args, **kwargs): - return - return _mock + return MagicMock() def register(con, *args, **kwargs): ===================================== gajim/common/modules/presence.py ===================================== --- a/gajim/common/modules/presence.py +++ b/gajim/common/modules/presence.py @@ -140,15 +140,15 @@ class Presence: if not app.account_is_connected(self._account): return if remove_auth: - self._con.connection.getRoster().delItem(jid) + self._con.getRoster().delItem(jid) jid_list = app.config.get_per('contacts') for j in jid_list: if j.startswith(jid): app.config.del_per('contacts', j) else: log.info('Unsubscribe from %s', jid) - self._con.connection.getRoster().Unsubscribe(jid) - self._con.connection.getRoster().setItem(jid) + self._con.getRoster().Unsubscribe(jid) + self._con.getRoster().setItem(jid) def subscribe(self, jid, msg='', name='', groups=None, auto_auth=False, user_nick=''): ===================================== gajim/common/modules/roster.py ===================================== --- /dev/null +++ b/gajim/common/modules/roster.py @@ -0,0 +1,351 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Roster + +import logging +from collections import namedtuple + +import nbxmpp + +from gajim.common import app +from gajim.common.nec import NetworkEvent + +log = logging.getLogger('gajim.c.m.roster') + + +# TODO: Error IQs +# What if roster not supported on server -> error + +RosterItem = namedtuple('RosterItem', 'jid data') + + +class Roster: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('iq', self._roster_push_received, 'set', nbxmpp.NS_ROSTER), + ('presence', self._presence_received) + ] + + self._data = {} + self._set = None + + def load_roster(self): + log.info('Load from database') + account_jid = self._con.get_own_jid().getStripped() + data = app.logger.get_roster(account_jid) + if data: + self.setRaw(data) + for jid, item in self._data.items(): + app.nec.push_incoming_event(NetworkEvent( + 'roster-info', + conn=self._con, + jid=jid, + nickname=item['name'], + sub=item['subscription'], + ask=item['ask'], + groups=item['groups'], + avatar_sha=item['avatar_sha'])) + else: + log.info('Database empty, reset roster version') + app.config.set_per( + 'accounts', self._account, 'roster_version', '') + + def request_roster(self, version): + log.info('Requested from server') + iq = nbxmpp.Iq('get', nbxmpp.NS_ROSTER) + if version is not None: + iq.setTagAttr('query', 'ver', version) + log.info('Request version: %s', version) + self._con.connection.SendAndCallForResponse( + iq, self._roster_received) + + def _roster_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('Unable to retrive roster: %s', stanza.getError()) + return + + log.info('Received Roster') + received_from_server = False + if stanza.getTag('query') is not None: + # clear Roster + self._data = {} + version = self._parse_roster(stanza) + + log.info('New version: %s', version) + app.logger.replace_roster(self._account, version, self._data) + + received_from_server = True + + app.nec.push_incoming_event(NetworkEvent( + 'roster-received', + conn=self._con, + roster=self._data.copy(), + received_from_server=received_from_server)) + + self._con.send_first_presence() + + def _roster_push_received(self, con, stanza): + log.info('Push received') + + sender = stanza.getFrom() + if sender is not None: + if not self._con.get_own_jid().bareMatch(sender): + log.warning('Wrong JID %s', stanza.getFrom()) + return + + push_items, version = self._parse_push(stanza) + + self._ack_roster_push(stanza) + + for item in push_items: + attrs = item.data + app.nec.push_incoming_event(NetworkEvent( + 'roster-info', + conn=self._con, + jid=item.jid, + nickname=attrs['name'], + sub=attrs['subscription'], + ask=attrs['ask'], + groups=attrs['groups'], + avatar_sha=None)) + account_jid = self._con.get_own_jid().getStripped() + app.logger.add_or_update_contact( + account_jid, item.jid, attrs['name'], + attrs['subscription'], attrs['ask'], attrs['groups']) + + log.info('New version: %s', version) + app.config.set_per( + 'accounts', self._account, 'roster_version', version) + + raise nbxmpp.NodeProcessed + + def _parse_roster(self, stanza): + query = stanza.getTag('query') + version = query.getAttr('ver') + + for item in query.getTags('item'): + jid = item.getAttr('jid') + self._data[jid] = self._get_item_attrs(item, update=False) + log.info('Item %s: %s', jid, self._data[jid]) + return version + + @staticmethod + def _get_item_attrs(item, update=True): + ''' + update: True + returns only the attrs that are present in the item + + update: False + returns the attrs of the item but fills missing + attrs with default values + ''' + + default_attrs = {'name': None, + 'ask': None, + 'subscription': None, + 'groups': [], + 'avatar_sha': None} + + attrs = item.getAttrs() + del attrs['jid'] + groups = set([group.getData() for group in item.getTags('group')]) + attrs['groups'] = list(groups) + + if update: + return attrs + default_attrs.update(attrs) + return default_attrs + + def _parse_push(self, stanza): + query = stanza.getTag('query') + version = query.getAttr('ver') + push_items = [] + + for item in query.getTags('item'): + push_items.append(self._update_roster_item(item)) + for item in push_items: + log.info('Push: %s', item) + return push_items, version + + def _update_roster_item(self, item): + jid = item.getAttr('jid') + + if item.getAttr('subscription') == 'remove': + self._data.pop(jid, None) + attrs = self._get_item_attrs(item, update=False) + return RosterItem(jid, attrs) + + else: + if jid not in self._data: + self._data[jid] = self._get_item_attrs(item, update=False) + else: + self._data[jid].update(self._get_item_attrs(item)) + + return RosterItem(jid, self._data[jid]) + + def _ack_roster_push(self, stanza): + iq = nbxmpp.Iq('result', + to=stanza.getFrom(), + frm=stanza.getTo(), + attrs={'id': stanza.getID()}) + self._con.connection.send(iq) + + def _presence_received(self, con, pres): + ''' + Add contacts that request subscription to our internal + roster and also to the database. The contact is put into the + 'Not in roster' group and because we save it to the database + it is also after a restart available. + ''' + + if pres.getType() != 'subscribe': + return + + jid = pres.getFrom().getStripped() + + if jid in self._data: + return + + log.info('Add Contact from presence %s', jid) + self._data[jid] = {'name': None, + 'ask': None, + 'subscription': + 'none', + 'groups': ['Not in roster']} + account_jid = self._con.get_own_jid().getStripped() + app.logger.add_or_update_contact( + account_jid, jid, + self._data[jid]['name'], + self._data[jid]['subscription'], + self._data[jid]['ask'], + self._data[jid]['groups']) + + def _getItemData(self, jid, dataname): + """ + Return specific jid's representation in internal format. + """ + jid = jid[:(jid + '/').find('/')] + return self._data[jid][dataname] + + def delItem(self, jid): + """ + Delete contact 'jid' from roster + """ + self._con.connection.send( + nbxmpp.Iq('set', nbxmpp.NS_ROSTER, payload=[ + nbxmpp.Node('item', {'jid': jid, 'subscription': 'remove'})])) + + def getGroups(self, jid): + """ + Return groups list that contact 'jid' belongs to + """ + return self._getItemData(jid, 'groups') + + def getName(self, jid): + """ + Return name of contact 'jid' + """ + return self._getItemData(jid, 'name') + + def setItem(self, jid, name=None, groups=None): + """ + Rename contact 'jid' and sets the groups list that it now belongs to + """ + iq = nbxmpp.Iq('set', nbxmpp.NS_ROSTER) + query = iq.getTag('query') + attrs = {'jid': jid} + if name: + attrs['name'] = name + item = query.setTag('item', attrs) + if groups is not None: + for group in groups: + item.addChild(node=nbxmpp.Node('group', payload=[group])) + self._con.connection.send(iq) + + def setItemMulti(self, items): + """ + Rename multiple contacts and sets their group lists + """ + for i in items: + iq = nbxmpp.Iq('set', nbxmpp.NS_ROSTER) + query = iq.getTag('query') + attrs = {'jid': i['jid']} + if i['name']: + attrs['name'] = i['name'] + item = query.setTag('item', attrs) + for group in i['groups']: + item.addChild(node=nbxmpp.Node('group', payload=[group])) + self._con.connection.send(iq) + + def getItems(self): + """ + Return list of all [bare] JIDs that the roster is currently tracks + """ + return list(self._data.keys()) + + def keys(self): + """ + Same as getItems. Provided for the sake of dictionary interface + """ + return list(self._data.keys()) + + def __getitem__(self, item): + """ + Get the contact in the internal format. + Raises KeyError if JID 'item' is not in roster + """ + return self._data[item] + + def getItem(self, item): + """ + Get the contact in the internal format (or None if JID 'item' is not in + roster) + """ + if item in self._data: + return self._data[item] + + def Unsubscribe(self, jid): + """ + Ask for removing our subscription for JID 'jid' + """ + self._con.connection.send(nbxmpp.Presence(jid, 'unsubscribe')) + + def getRaw(self): + """ + Return the internal data representation of the roster + """ + return self._data + + def setRaw(self, data): + """ + Set the internal data representation of the roster + """ + own_jid = self._con.get_own_jid().getStripped() + self._data = data + self._data[own_jid] = { + 'resources': {}, + 'name': None, + 'ask': None, + 'subscription': None, + 'groups': None, + 'avatar_sha': None + } + + +def get_instance(*args, **kwargs): + return Roster(*args, **kwargs), 'Roster' ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -135,9 +135,11 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): diffs = self.roster.getDiffs() for key in diffs: self.roster.setItem(key) - app.nec.push_incoming_event(RosterInfoEvent(None, conn=self, - jid=key, nickname=self.roster.getName(key), sub='both', - ask='no', groups=self.roster.getGroups(key))) + app.nec.push_incoming_event(NetworkEvent( + 'roster-info', conn=self,jid=key, + nickname=self.roster.getName(key), sub='both', + ask='no', groups=self.roster.getGroups(key), + avatar_sha=None)) app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( None, conn=self, fjid=key, show=self.roster.getStatus(key), status=self.roster.getMessage(key))) @@ -147,9 +149,11 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): # callbacks called from zeroconf def _on_new_service(self, jid): self.roster.setItem(jid) - app.nec.push_incoming_event(RosterInfoEvent(None, conn=self, - jid=jid, nickname=self.roster.getName(jid), sub='both', - ask='no', groups=self.roster.getGroups(jid))) + app.nec.push_incoming_event(NetworkEvent( + 'roster-info', conn=self, jid=jid, + nickname=self.roster.getName(jid), sub='both', + ask='no', groups=self.roster.getGroups(jid), + avatar_sha=None)) app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( None, conn=self, fjid=jid, show=self.roster.getStatus(jid), status=self.roster.getMessage(jid))) @@ -219,14 +223,16 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): else: self.connection.announce() self.roster = self.connection.getRoster() - app.nec.push_incoming_event(RosterReceivedEvent(None, conn=self, - xmpp_roster=self.roster)) + app.nec.push_incoming_event(NetworkEvent('roster-received', conn=self, + roster=self.roster.copy(), received_from_server=True)) # display contacts already detected and resolved for jid in self.roster.keys(): - app.nec.push_incoming_event(RosterInfoEvent(None, conn=self, - jid=jid, nickname=self.roster.getName(jid), sub='both', - ask='no', groups=self.roster.getGroups(jid))) + app.nec.push_incoming_event(NetworkEvent( + 'roster-info', conn=self, jid=jid, + nickname=self.roster.getName(jid), sub='both', + ask='no', groups=self.roster.getGroups(jid), + avatar_sha=None)) app.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( None, conn=self, fjid=jid, show=self.roster.getStatus(jid), status=self.roster.getMessage(jid))) ===================================== gajim/common/zeroconf/roster_zeroconf.py ===================================== --- a/gajim/common/zeroconf/roster_zeroconf.py +++ b/gajim/common/zeroconf/roster_zeroconf.py @@ -18,15 +18,14 @@ ## -from gajim.common.zeroconf import zeroconf from gajim.common.zeroconf.zeroconf import Constant, ConstantRI + class Roster: def __init__(self, zeroconf): self._data = None self.zeroconf = zeroconf # our zeroconf instance self.version = '' - self.received_from_server = True def update_roster(self): for val in self.zeroconf.contacts.values(): @@ -109,6 +108,9 @@ class Roster: def __getitem__(self, jid): return self._data[jid] + def __setitem__(self, jid, value): + self._data[jid] = value + def getItems(self): # Return list of all [bare] JIDs that the roster currently tracks. return self._data.keys() @@ -157,3 +159,6 @@ class Roster: def Unauthorize(self, jid): pass + + def copy(self): + return self._data.copy() ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2628,7 +2628,7 @@ class Interface: self.roster._before_fill() for account in app.connections: - app.connections[account].load_roster_from_db() + app.connections[account].get_module('Roster').load_roster() self.roster._after_fill() # get instances for windows/dialogs that will show_all()/hide() ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2593,8 +2593,8 @@ class RosterWindow: return if obj.nick == gc_ctrl.nick: - contact = app.contacts.get_contact_with_highest_priority(account, - obj.room_jid) + contact = app.contacts.get_contact_with_highest_priority( + account, obj.room_jid) if contact: contact.show = obj.show self.draw_contact(obj.room_jid, account) @@ -2615,28 +2615,28 @@ class RosterWindow: if app.connections[account].server_resource: resource = app.connections[account].server_resource sha = app.config.get_per('accounts', account, 'avatar_sha') - contact = app.contacts.create_contact(jid=self_jid, - account=account, name=app.nicks[account], + contact = app.contacts.create_contact( + jid=self_jid, account=account, name=app.nicks[account], groups=['self_contact'], show='offline', sub='both', ask='none', resource=resource, avatar_sha=sha) app.contacts.add_contact(account, contact) self.add_contact(self_jid, account) if app.config.get('remember_opened_chat_controls'): account = obj.conn.name - controls = app.config.get_per('accounts', account, - 'opened_chat_controls') + controls = app.config.get_per( + 'accounts', account, 'opened_chat_controls') if controls: for jid in controls.split(','): contact = \ app.contacts.get_contact_with_highest_priority( - account, jid) + account, jid) if not contact: - contact = self.add_to_not_in_the_roster(account, - jid) - app.interface.on_open_chat_window(None, contact, - account) - app.config.set_per('accounts', account, - 'opened_chat_controls', '') + contact = self.add_to_not_in_the_roster( + account, jid) + app.interface.on_open_chat_window( + None, contact, account) + app.config.set_per( + 'accounts', account, 'opened_chat_controls', '') GLib.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj): ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -384,34 +384,6 @@ class RosterTooltip(Gtk.Window, StatusTable): contact.keyID = app.config.get_per('accounts', connection.name, 'keyid') contacts.append(contact) - # if we're online ... - if connection.connection: - roster = connection.connection.getRoster() - # in threadless connection when no roster stanza is sent - # 'roster' is None - if roster and roster.getItem(jid): - resources = roster.getResources(jid) - # ...get the contact info for our other online - # resources - for resource in resources: - # Check if we already have this resource - found = False - for contact_ in contacts: - if contact_.resource == resource: - found = True - break - if found: - continue - show = roster.getShow(jid + '/' + resource) - if not show: - show = 'online' - contact = app.contacts.create_self_contact( - jid=jid, account=account, show=show, - status=roster.getStatus( - jid + '/' + resource), - priority=roster.getPriority( - jid + '/' + resource), resource=resource) - contacts.append(contact) # Username/Account/Groupchat self.prim_contact = app.contacts.get_highest_prio_contact_from_contacts( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/db77fa1aceb0364ad98521c38a5164997f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/db77fa1aceb0364ad98521c38a5164997f… 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