Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Bookmarks: Register event handler correctly
by Philipp Hörist 28 Sep '19

28 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0c84072e by Philipp Hörist at 2019-09-28T23:33:52Z Bookmarks: Register event handler correctly - - - - - 1 changed file: - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -43,6 +43,7 @@ class Bookmarks(BaseModule): def __init__(self, con): BaseModule.__init__(self, con) self._register_pubsub_handler(self._bookmark_event_received) + self._register_pubsub_handler(self._bookmark_2_event_received) self._conversion = False self._conversion_2 = False self._bookmarks = [] @@ -108,7 +109,7 @@ class Bookmarks(BaseModule): NetworkEvent('bookmarks-received', account=self._account)) @event_node(nbxmpp.NS_BOOKMARKS_2) - def _bookmark_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) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0c84072ea78a2f0bd6d432cebe152fce6d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0c84072ea78a2f0bd6d432cebe152fce6d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add Bookmarks 2 (XEP-0402) support
by Philipp Hörist 28 Sep '19

28 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3d381a98 by Philipp Hörist at 2019-09-28T23:16:57Z Add Bookmarks 2 (XEP-0402) support - - - - - 6 changed files: - gajim/common/app.py - gajim/common/helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/discovery.py - gajim/common/modules/muc.py - gajim/gtk/bookmarks.py Changes: ===================================== gajim/common/app.py ===================================== @@ -181,7 +181,6 @@ gajim_common_features = [ nbxmpp.NS_JINGLE_BYTESTREAM, nbxmpp.NS_JINGLE_IBB, nbxmpp.NS_AVATAR_METADATA + '+notify', - nbxmpp.NS_BOOKMARKS + '+notify', ] # Optional features gajim supports per account ===================================== gajim/common/helpers.py ===================================== @@ -1087,6 +1087,10 @@ def update_optional_features(account=None): features.append(nbxmpp.NS_NICK + '+notify') if app.config.get_per('accounts', account_, 'subscribe_location'): features.append(nbxmpp.NS_LOCATION + '+notify') + if app.connections[account_].get_module('Bookmarks').using_bookmark_2: + features.append(nbxmpp.NS_BOOKMARKS_2 + '+notify') + elif app.connections[account_].get_module('Bookmarks').using_bookmark_1: + features.append(nbxmpp.NS_BOOKMARKS + '+notify') if not app.config.get('ignore_incoming_xhtml'): features.append(nbxmpp.NS_XHTML_IM) if app.config.get_per('accounts', account_, 'answer_receipts'): ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -37,12 +37,14 @@ class Bookmarks(BaseModule): _nbxmpp_methods = [ 'request_bookmarks', 'store_bookmarks', + 'retract_bookmark', ] def __init__(self, con): BaseModule.__init__(self, con) self._register_pubsub_handler(self._bookmark_event_received) self._conversion = False + self._conversion_2 = False self._bookmarks = [] self._join_timeouts = [] self._request_in_progress = False @@ -51,6 +53,10 @@ class Bookmarks(BaseModule): def conversion(self): return self._conversion + @property + def conversion_2(self): + return self._conversion_2 + @property def bookmarks(self): return self._bookmarks @@ -59,6 +65,14 @@ class Bookmarks(BaseModule): def bookmarks(self, value): self._bookmarks = value + @property + def using_bookmark_1(self): + return self._pubsub_support() and self.conversion + + @property + def using_bookmark_2(self): + return self._pubsub_support() and self.conversion_2 + @event_node(nbxmpp.NS_BOOKMARKS) def _bookmark_event_received(self, _con, stanza, properties): if properties.pubsub_event.retracted: @@ -66,7 +80,7 @@ class Bookmarks(BaseModule): return bookmarks = properties.pubsub_event.data - if properties.pubsub_event.deleted: + if properties.pubsub_event.deleted or properties.pubsub_event.purged: self._log.info('Bookmark node deleted') bookmarks = [] @@ -80,7 +94,7 @@ class Bookmarks(BaseModule): properties.jid) return - if not self._pubsub_support() or not self.conversion: + if not self.using_bookmark_1: return if self._request_in_progress: @@ -93,11 +107,60 @@ class Bookmarks(BaseModule): app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - def pass_disco(self, info): - if nbxmpp.NS_BOOKMARK_CONVERSION not in info.features: + @event_node(nbxmpp.NS_BOOKMARKS_2) + def _bookmark_event_received(self, _con, stanza, properties): + if not properties.is_self_message: + self._log.warning('%s has an open access bookmarks node', + properties.jid) + return + + if not self.using_bookmark_2: + return + + if self._request_in_progress: + self._log.info('Ignore update, pubsub request in progress') return - self._conversion = True - self._log.info('Discovered Bookmarks Conversion: %s', info.jid) + + 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._bookmarks = [] + + elif properties.pubsub_event.retracted: + jid = properties.pubsub_event.id + self._log.info('Retract: %s', jid) + bookmark = self.get_bookmark_from_jid(jid) + if bookmark is not None: + try: + self._bookmarks.remove(bookmark) + 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) + if old_bookmark is not None: + self._bookmarks.remove(old_bookmark) + self._bookmarks.append(new_bookmark) + + self._act_on_changed_bookmarks(old_bookmarks) + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) + + def pass_disco(self, info): + if nbxmpp.NS_BOOKMARKS_COMPAT in info.features: + self._conversion_2 = True + self._log.info('Discovered Bookmarks Conversion 2: %s', info.jid) + + elif nbxmpp.NS_BOOKMARK_CONVERSION in info.features: + self._conversion = True + self._log.info('Discovered Bookmarks Conversion: %s', info.jid) def _act_on_changed_bookmarks(self, old_bookmarks): new_bookmarks = self._convert_to_set(self._bookmarks) @@ -142,8 +205,11 @@ class Bookmarks(BaseModule): self._request_in_progress = True type_ = BookmarkStoreType.PRIVATE - if self._pubsub_support() and self.conversion: - type_ = BookmarkStoreType.PUBSUB + if self._pubsub_support(): + if self.conversion: + type_ = BookmarkStoreType.PUBSUB_BOOKMARK_1 + if self._conversion_2: + type_ = BookmarkStoreType.PUBSUB_BOOKMARK_2 self._nbxmpp('Bookmarks').request_bookmarks( type_, callback=self._bookmarks_received) @@ -159,15 +225,48 @@ class Bookmarks(BaseModule): app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - def store_bookmarks(self): + def store_difference(self, bookmarks): + if self.using_bookmark_2: + retract, add_or_modify = self._determine_changed_bookmarks( + bookmarks, self._bookmarks) + + for bookmark in retract: + self.remove(str(bookmark.jid)) + + if add_or_modify: + self.store_bookmarks(add_or_modify) + self._bookmarks = bookmarks + + else: + self._bookmarks = bookmarks + self.store_bookmarks() + + def store_bookmarks(self, bookmarks=None): if not app.account_is_connected(self._account): return type_ = BookmarkStoreType.PRIVATE - if self._pubsub_support() and self.conversion: - type_ = BookmarkStoreType.PUBSUB + if self._pubsub_support(): + if self.conversion: + type_ = BookmarkStoreType.PUBSUB_BOOKMARK_1 + if self.conversion_2: + type_ = BookmarkStoreType.PUBSUB_BOOKMARK_2 + + self._nbxmpp('Bookmarks').store_bookmarks(bookmarks or self._bookmarks, + type_) + + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) + + def store_bookmark(self, bookmark): + if not app.account_is_connected(self._account): + return + + if not self.using_bookmark_2: + return - self._nbxmpp('Bookmarks').store_bookmarks(self._bookmarks, type_) + self._nbxmpp('Bookmarks').store_bookmarks( + [bookmark], BookmarkStoreType.PUBSUB_BOOKMARK_2) app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) @@ -199,19 +298,35 @@ class Bookmarks(BaseModule): def modify(self, jid: str, **kwargs: Dict[str, str]) -> None: bookmark = self.get_bookmark_from_jid(jid) if bookmark is None: - bookmark = BookmarkData(jid=jid, **kwargs) - self._bookmarks.append(bookmark) - self._log.info('Add new bookmark: %s', bookmark) + return + + new_bookmark = bookmark._replace(**kwargs) + if new_bookmark == bookmark: + # No change happened + return + self._log.info('Modify bookmark: %s %s', jid, kwargs) + self._bookmarks.remove(bookmark) + self._bookmarks.append(new_bookmark) + + if self.using_bookmark_2: + self.store_bookmark(new_bookmark) else: - modified_bookmark = bookmark._replace(**kwargs) - if modified_bookmark == bookmark: - # No change happened - return - self._log.info('Modify bookmark: %s %s', jid, kwargs) - self._bookmarks.remove(bookmark) - self._bookmarks.append(modified_bookmark) + self.store_bookmarks() + + def add_or_modify(self, jid: str, **kwargs: Dict[str, str]) -> None: + bookmark = self.get_bookmark_from_jid(jid) + if bookmark is not None: + self.modify(jid, **kwargs) + return - self.store_bookmarks() + new_bookmark = BookmarkData(jid=jid, **kwargs) + self._bookmarks.append(new_bookmark) + self._log.info('Add new bookmark: %s', new_bookmark) + + if self.using_bookmark_2: + self.store_bookmark(new_bookmark) + else: + self.store_bookmarks() def remove(self, jid: str, publish: bool = True) -> None: bookmark = self.get_bookmark_from_jid(jid) @@ -219,7 +334,27 @@ class Bookmarks(BaseModule): return self._bookmarks.remove(bookmark) if publish: - self.store_bookmarks() + if self.using_bookmark_2: + self._nbxmpp('Bookmarks').retract_bookmark(jid) + else: + self.store_bookmarks() + + @staticmethod + def _determine_changed_bookmarks(new_bookmarks, old_bookmarks): + new_jids = [bookmark.jid for bookmark in new_bookmarks] + new_bookmarks = set(new_bookmarks) + old_bookmarks = set(old_bookmarks) + + retract = [] + add_or_modify = [] + changed_bookmarks = new_bookmarks.symmetric_difference(old_bookmarks) + + for bookmark in changed_bookmarks: + if bookmark.jid not in new_jids: + retract.append(bookmark) + if bookmark in new_bookmarks: + add_or_modify.append(bookmark) + return retract, add_or_modify def get_name_from_bookmark(self, jid: str) -> str: bookmark = self.get_bookmark_from_jid(jid) ===================================== gajim/common/modules/discovery.py ===================================== @@ -20,8 +20,9 @@ from nbxmpp.util import is_error_result from gajim.common import app from gajim.common.nec import NetworkIncomingEvent -from gajim.common.modules.base import BaseModule from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule +from gajim.common.helpers import update_optional_features class Discovery(BaseModule): @@ -106,6 +107,8 @@ class Discovery(BaseModule): if 'urn:xmpp:pep-vcard-conversion:0' in result.features: self._con.avatar_conversion = True + update_optional_features() + def discover_server_info(self): # Calling this method starts the connect_maschine() server = self._con.get_own_jid().getDomain() ===================================== gajim/common/modules/muc.py ===================================== @@ -688,10 +688,11 @@ class MUC(BaseModule): self._remove_rejoin_timeout(muc_data.jid) # We successfully joined a MUC, set add bookmark with autojoin - self._con.get_module('Bookmarks').modify(muc_data.jid, - autojoin=True, - password=muc_data.password, - nick=muc_data.nick) + self._con.get_module('Bookmarks').add_or_modify( + muc_data.jid, + autojoin=True, + password=muc_data.password, + nick=muc_data.nick) def _on_voice_request(self, _con, _stanza, properties): if not properties.is_voice_request: ===================================== gajim/gtk/bookmarks.py ===================================== @@ -19,6 +19,7 @@ from gi.repository import Gtk from gi.repository import Gdk from nbxmpp.structs import BookmarkData from nbxmpp.protocol import validate_resourcepart +from nbxmpp.protocol import JID from gajim.common import app from gajim.common.helpers import validate_jid @@ -142,7 +143,8 @@ class Bookmarks(Gtk.ApplicationWindow): for row in self._ui.bookmarks_store: if not row[Column.ADDRESS]: continue - bookmark = BookmarkData(jid=row[Column.ADDRESS], + + bookmark = BookmarkData(jid=JID(row[Column.ADDRESS]), name=row[Column.NAME], autojoin=row[Column.AUTOJOIN], password=row[Column.PASSWORD], @@ -150,8 +152,7 @@ class Bookmarks(Gtk.ApplicationWindow): bookmarks.append(bookmark) con = app.connections[self.account] - con.get_module('Bookmarks').bookmarks = bookmarks - con.get_module('Bookmarks').store_bookmarks() + con.get_module('Bookmarks').store_difference(bookmarks) self.destroy() @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d381a9863679ea97a0f33a5f6dbd2e9ee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d381a9863679ea97a0f33a5f6dbd2e9ee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add Bookmarks 2 (XEP-0402) support
by Philipp Hörist 28 Sep '19

28 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 550decfd by Philipp Hörist at 2019-09-28T23:12:58Z Add Bookmarks 2 (XEP-0402) support - - - - - 5 changed files: - nbxmpp/const.py - nbxmpp/modules/bookmarks.py - nbxmpp/modules/pubsub.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -310,7 +310,8 @@ Role._WEIGHTS = { class BookmarkStoreType(Enum): - PUBSUB = 'pubsub' + PUBSUB_BOOKMARK_2 = 'pubsub bookmark 2' + PUBSUB_BOOKMARK_1 = 'pubsub bookmark 1' PRIVATE = 'private' ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -18,6 +18,7 @@ import logging from nbxmpp.protocol import NS_BOOKMARKS +from nbxmpp.protocol import NS_BOOKMARKS_2 from nbxmpp.protocol import NS_PUBSUB_EVENT from nbxmpp.protocol import NS_PRIVATE from nbxmpp.protocol import isResultNode @@ -32,13 +33,31 @@ from nbxmpp.util import to_xs_boolean from nbxmpp.util import call_on_response from nbxmpp.util import callback from nbxmpp.util import raise_error +from nbxmpp.util import is_error_result from nbxmpp.modules.pubsub import get_pubsub_item +from nbxmpp.modules.pubsub import get_pubsub_items from nbxmpp.modules.pubsub import get_pubsub_request -from nbxmpp.modules.pubsub import get_bookmark_publish_options +from nbxmpp.modules.pubsub import get_publish_options + log = logging.getLogger('nbxmpp.m.bookmarks') +BOOKMARK_1_OPTIONS = { + 'pubsub#persist_items': 'true', + 'pubsub#access_model': 'whitelist', +} + +BOOKMARK_2_OPTIONS = { + 'pubsub#notify_delete': 'true', + 'pubsub#notify_retract': 'true', + 'pubsub#persist_items': 'true', + 'pubsub#max_items': '128', + 'pubsub#access_model': 'whitelist', + 'pubsub#send_last_published_item': 'never', +} + + class Bookmarks: def __init__(self, client): self._client = client @@ -47,8 +66,17 @@ class Bookmarks: callback=self._process_pubsub_bookmarks, ns=NS_PUBSUB_EVENT, priority=16), + StanzaHandler(name='message', + callback=self._process_pubsub_bookmarks2, + ns=NS_PUBSUB_EVENT, + priority=16), ] + self._bookmark_2_queue = {} + self._bookmark_1_queue = [] + self._node_configuration_in_progress = False + self._node_configuration_not_possible = False + def _process_pubsub_bookmarks(self, _con, _stanza, properties): if not properties.is_pubsub_event: return @@ -78,6 +106,30 @@ class Bookmarks: properties.pubsub_event = pubsub_event + def _process_pubsub_bookmarks2(self, _con, _stanza, properties): + if not properties.is_pubsub_event: + return + + 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: + return + + bookmark_item = self._parse_bookmarks2(item) + if bookmark_item is None: + return + + pubsub_event = properties.pubsub_event._replace(data=bookmark_item) + log.info('Received bookmark item from: %s', properties.jid) + log.info(bookmark_item) + + properties.pubsub_event = pubsub_event + @staticmethod def _parse_bookmarks(storage): bookmarks = [] @@ -111,6 +163,35 @@ class Bookmarks: return bookmarks + @staticmethod + def _parse_bookmarks2(item): + jid = item.getAttr('id') + if jid is None: + log.warning('No id attr found') + return + + try: + jid = JID(jid) + except Exception as error: + log.warning('Invalid JID: %s', error) + log.warning(item) + return + + conference = item.getTag('conference', namespace=NS_BOOKMARKS_2) + if conference is None: + log.warning('No conference node found') + log.warning(item) + return + + autojoin = conference.getAttr('autojoin') == 'true' + name = conference.getAttr('name') + nick = conference.getTagData('nick') + + return BookmarkData(jid=jid, + name=name or None, + autojoin=autojoin, + nick=nick or None) + @staticmethod def get_private_request(): iq = Iq(typ='get') @@ -121,10 +202,16 @@ class Bookmarks: @call_on_response('_bookmarks_received') def request_bookmarks(self, type_): jid = self._client.get_bound_jid().getBare() - if type_ == BookmarkStoreType.PUBSUB: + if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_2: + log.info('Request bookmarks 2 (PubSub)') + request = get_pubsub_request(jid, NS_BOOKMARKS_2) + return request, {'type_': type_} + + if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_1: log.info('Request bookmarks (PubSub)') request = get_pubsub_request(jid, NS_BOOKMARKS, max_items=1) return request, {'type_': type_} + if type_ == BookmarkStoreType.PRIVATE: log.info('Request bookmarks (Private Storage)') return self.get_private_request(), {'type_': type_} @@ -135,16 +222,27 @@ class Bookmarks: return raise_error(log.info, stanza) bookmarks = [] - if type_ == BookmarkStoreType.PUBSUB: + if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_2: + items = get_pubsub_items(stanza, NS_BOOKMARKS_2) + if items is None: + return bookmarks + for item in items: + bookmark_item = self._parse_bookmarks2(item) + if bookmark_item is not None: + bookmarks.append(bookmark_item) + + elif type_ == BookmarkStoreType.PUBSUB_BOOKMARK_1: item = get_pubsub_item(stanza) - storage_node = item.getTag('storage', namespace=NS_BOOKMARKS) + if item is not None: + storage_node = item.getTag('storage', namespace=NS_BOOKMARKS) + if storage_node.getChildren(): + bookmarks = self._parse_bookmarks(storage_node) - if type_ == BookmarkStoreType.PRIVATE: + elif type_ == BookmarkStoreType.PRIVATE: query = stanza.getQuery() storage_node = query.getTag('storage', namespace=NS_BOOKMARKS) - - if storage_node.getChildren(): - bookmarks = self._parse_bookmarks(storage_node) + if storage_node.getChildren(): + bookmarks = self._parse_bookmarks(storage_node) from_ = stanza.getFrom() if from_ is None: @@ -169,22 +267,137 @@ class Bookmarks: conf_node.setTagData('password', bookmark.password) return storage_node + @staticmethod + def _build_conference_node(bookmark): + attrs = {'xmlns': NS_BOOKMARKS_2} + if bookmark.autojoin: + attrs['autojoin'] = 'true' + if bookmark.name: + attrs['name'] = bookmark.name + conference = Node(tag='conference', attrs=attrs) + if bookmark.nick: + conference.setTagData('nick', bookmark.nick) + return conference + def store_bookmarks(self, bookmarks, type_): - if type_ == BookmarkStoreType.PUBSUB: - self._store_with_pubsub(bookmarks) + if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_2: + self._store_bookmark_2(bookmarks) + elif type_ == BookmarkStoreType.PUBSUB_BOOKMARK_1: + self._store_bookmark_1(bookmarks) elif type_ == BookmarkStoreType.PRIVATE: self._store_with_private(bookmarks) - def _store_with_pubsub(self, bookmarks): - log.info('Store Bookmarks (PubSub)') + def retract_bookmark(self, bookmark_jid): + log.info('Retract Bookmark: %s', bookmark_jid) + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').retract(jid, + NS_BOOKMARKS_2, + str(bookmark_jid)) + + def _store_bookmark_1(self, bookmarks): + log.info('Store Bookmarks 1 (PubSub)') jid = self._client.get_bound_jid().getBare() + self._bookmark_1_queue = bookmarks item = self._build_storage_node(bookmarks) - options = get_bookmark_publish_options() - self._client.get_module('PubSub').publish(jid, - NS_BOOKMARKS, - item, - id_='current', - options=options) + options = get_publish_options(BOOKMARK_1_OPTIONS) + self._client.get_module('PubSub').publish( + jid, + NS_BOOKMARKS, + item, + id_='current', + options=options, + callback=self._on_store_bookmark_result, + user_data=NS_BOOKMARKS) + + def _store_bookmark_2(self, bookmarks): + if self._node_configuration_not_possible: + log.warning('Node configuration not possible') + return + + log.info('Store Bookmarks 2 (PubSub)') + jid = self._client.get_bound_jid().getBare() + for bookmark in bookmarks: + self._bookmark_2_queue[bookmark.jid] = bookmark + item = self._build_conference_node(bookmark) + options = get_publish_options(BOOKMARK_2_OPTIONS) + self._client.get_module('PubSub').publish( + jid, + NS_BOOKMARKS_2, + item, + id_=str(bookmark.jid), + options=options, + callback=self._on_store_bookmark_result, + user_data=NS_BOOKMARKS_2) + + def _on_store_bookmark_result(self, result, node): + if not is_error_result(result): + self._bookmark_1_queue = [] + self._bookmark_2_queue.pop(result.id, None) + return + + if (result.condition == 'conflict' and + result.app_condition == 'precondition-not-met'): + if self._node_configuration_in_progress: + return + + self._node_configuration_in_progress = True + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').get_node_configuration( + jid, + node, + callback=self._on_node_configuration_received) + + else: + self._bookmark_1_queue = [] + self._bookmark_2_queue.pop(result.id, None) + log.warning(result) + + def _on_node_configuration_received(self, result): + if is_error_result(result): + log.warning(result) + self._bookmark_1_queue = [] + self._bookmark_2_queue.clear() + return + + if result.node == NS_BOOKMARKS: + config = BOOKMARK_1_OPTIONS + else: + config = BOOKMARK_2_OPTIONS + self._apply_config(result.form, config) + self._client.get_module('PubSub').set_node_configuration( + result.jid, + result.node, + result.form, + callback=self._on_node_configuration_finished) + + def _on_node_configuration_finished(self, result): + self._node_configuration_in_progress = False + if is_error_result(result): + log.warning(result) + self._bookmark_2_queue.clear() + self._bookmark_1_queue = [] + self._node_configuration_not_possible = True + return + + log.info('Republish bookmarks') + if self._bookmark_2_queue: + bookmarks = self._bookmark_2_queue.copy() + self._bookmark_2_queue.clear() + self._store_bookmark_2(bookmarks.values()) + else: + bookmarks = self._bookmark_1_queue.copy() + self._bookmark_1_queue.clear() + self._store_bookmark_1(bookmarks) + + @staticmethod + def _apply_config(form, config): + for var, value in config.items(): + try: + field = form[var] + except KeyError: + pass + else: + field.value = value @call_on_response('_on_private_store_result') def _store_with_private(self, bookmarks): ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -20,6 +20,8 @@ import logging from nbxmpp.protocol import NS_PUBSUB from nbxmpp.protocol import NS_PUBSUB_EVENT from nbxmpp.protocol import NS_PUBSUB_PUBLISH_OPTIONS +from nbxmpp.protocol import NS_PUBSUB_OWNER +from nbxmpp.protocol import NS_PUBSUB_CONFIG from nbxmpp.protocol import NS_DATA from nbxmpp.protocol import Node from nbxmpp.protocol import Iq @@ -27,6 +29,9 @@ from nbxmpp.protocol import isResultNode from nbxmpp.structs import StanzaHandler from nbxmpp.structs import PubSubEventData from nbxmpp.structs import CommonResult +from nbxmpp.structs import PubSubConfigResult +from nbxmpp.structs import PubSubPublishResult +from nbxmpp.modules.dataforms import extend_form from nbxmpp.util import call_on_response from nbxmpp.util import callback from nbxmpp.util import raise_error @@ -56,28 +61,36 @@ class PubSub: node, empty=True, deleted=True) return - retract = event.getTag('retract') - if retract is not None: - node = retract.getAttr('node') - item = retract.getTag('item') - id_ = item.getAttr('id') - properties.pubsub_event = PubSubEventData( - node, id_, item, retracted=True) + 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 items = event.getTag('items') if items is not None: + node = items.getAttr('node') + + retract = items.getTag('retract') + if retract is not None: + id_ = retract.getAttr('id') + properties.pubsub_event = PubSubEventData( + node, id_, retracted=True) + return + if len(items.getChildren()) != 1: log.warning('PubSub event with more than one item') log.warning(stanza) - node = items.getAttr('node') + return + item = items.getTag('item') if item is None: return id_ = item.getAttr('id') properties.pubsub_event = PubSubEventData(node, id_, item) - @call_on_response('_default_response') + @call_on_response('_publish_result_received') def publish(self, jid, node, item, id_=None, options=None): query = Iq('set', to=jid) pubsub = query.addChild('pubsub', namespace=NS_PUBSUB) @@ -91,6 +104,87 @@ class PubSub: publish.addChild(node=options) return query + @callback + def _publish_result_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.warning, stanza) + + jid = stanza.getFrom() + pubsub = stanza.getTag('pubsub', namespace=NS_PUBSUB) + if pubsub is None: + return raise_error(log.warning, stanza, 'stanza-malformed') + + publish = pubsub.getTag('publish') + if publish is None: + return raise_error(log.warning, stanza, 'stanza-malformed') + + node = publish.getAttr('node') + item = publish.getTag('item') + if item is None: + return raise_error(log.warning, stanza, 'stanza-malformed') + + id_ = item.getAttr('id') + return PubSubPublishResult(jid, node, id_) + + @call_on_response('_default_response') + def retract(self, jid, node, id_, notify=True): + query = Iq('set', to=jid) + pubsub = query.addChild('pubsub', namespace=NS_PUBSUB) + attrs = {'node': node} + if notify: + attrs['notify'] = 'true' + retract = pubsub.addChild('retract', attrs=attrs) + retract.addChild('item', {'id': id_}) + return query + + @call_on_response('_default_response') + def set_node_configuration(self, jid, node, form): + log.info('Set configuration for %s %s', node, jid) + query = Iq('set', to=jid) + pubsub = query.addChild('pubsub', namespace=NS_PUBSUB_OWNER) + configure = pubsub.addChild('configure', {'node': node}) + form.setAttr('type', 'submit') + configure.addChild(node=form) + return query + + @call_on_response('_node_configuration_received') + def get_node_configuration(self, jid, node): + log.info('Request node configuration') + query = Iq('get', to=jid) + pubsub = query.addChild('pubsub', namespace=NS_PUBSUB_OWNER) + pubsub.addChild('configure', {'node': node}) + return query + + @callback + def _node_configuration_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.warning, stanza) + + jid = stanza.getFrom() + pubsub = stanza.getTag('pubsub', namespace=NS_PUBSUB_OWNER) + if pubsub is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'No pubsub node found') + + configure = pubsub.getTag('configure') + if configure is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'No configure node found') + + node = configure.getAttr('node') + + forms = configure.getTags('x', namespace=NS_DATA) + for form in forms: + dataform = extend_form(node=form) + form_type = dataform.vars.get('FORM_TYPE') + if form_type is None or form_type.value != NS_PUBSUB_CONFIG: + continue + log.info('Node configuration received from: %s', jid) + return PubSubConfigResult(jid=jid, node=node, form=dataform) + + return raise_error(log.warning, stanza, 'stanza-malformed', + 'No valid form type found') + @callback def _default_response(self, stanza): if not isResultNode(stanza): @@ -115,13 +209,23 @@ def get_pubsub_item(stanza): return items_node.getTag('item') -def get_bookmark_publish_options(): - # TODO: Make generic - options = Node(NS_DATA + ' x', - attrs={'type': 'submit'}) +def get_pubsub_items(stanza, node=None): + pubsub_node = stanza.getTag('pubsub') + items_node = pubsub_node.getTag('items') + if node is not None and items_node.getAttr('node') != node: + return + + if items_node is not None: + return items_node.getTags('item') + + +def get_publish_options(config): + options = Node(NS_DATA + ' x', attrs={'type': 'submit'}) field = options.addChild('field', attrs={'var': 'FORM_TYPE', 'type': 'hidden'}) field.setTagData('value', NS_PUBSUB_PUBLISH_OPTIONS) - field = options.addChild('field', attrs={'var': 'pubsub#access_model'}) - field.setTagData('value', 'whitelist') + + for var, value in config.items(): + field = options.addChild('field', attrs={'var': var}) + field.setTagData('value', value) return options ===================================== nbxmpp/protocol.py ===================================== @@ -51,6 +51,8 @@ NS_BIND = 'urn:ietf:params:xml:ns:xmpp-bind' NS_BLOCKING = 'urn:xmpp:blocking' # XEP-0191 NS_BOB = 'urn:xmpp:bob' # XEP-0231 NS_BOOKMARKS = 'storage:bookmarks' # XEP-0048 +NS_BOOKMARKS_2 = 'urn:xmpp:bookmarks:0' # XEP-0402 +NS_BOOKMARKS_COMPAT = 'urn:xmpp:bookmarks:0#compat' # XEP-0402 NS_BROWSE = 'jabber:iq:browse' NS_BROWSING = 'http://jabber.org/protocol/browsing' # XEP-0195 NS_BYTESTREAM = 'http://jabber.org/protocol/bytestreams' # XEP-0065 @@ -136,6 +138,7 @@ NS_PUBSUB = 'http://jabber.org/protocol/pubsub' # XEP-0060 NS_PUBSUB_EVENT = 'http://jabber.org/protocol/pubsub#event' NS_PUBSUB_PUBLISH_OPTIONS = NS_PUBSUB + '#publish-options' # XEP-0060 NS_PUBSUB_OWNER = 'http://jabber.org/protocol/pubsub#owner' # XEP-0060 +NS_PUBSUB_CONFIG = 'http://jabber.org/protocol/pubsub#node_config' # XEP-0060 NS_REGISTER = 'jabber:iq:register' NS_ROSTER = 'jabber:iq:roster' NS_ROSTERNOTES = 'storage:rosternotes' ===================================== nbxmpp/structs.py ===================================== @@ -70,8 +70,12 @@ 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') -PubSubEventData.__new__.__defaults__ = (None, None, None, False, False, False) +PubSubEventData = namedtuple('PubSubEventData', 'node id item data empty deleted retracted purged') +PubSubEventData.__new__.__defaults__ = (None, None, None, False, False, False, False) + +PubSubConfigResult = namedtuple('PubSubConfigResult', 'jid node form') + +PubSubPublishResult = namedtuple('PubSubPublishResult', 'jid node id') MoodData = namedtuple('MoodData', 'mood text') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/550decfd858f91fa5ada54ea04… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/550decfd858f91fa5ada54ea04… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix show_unsubscribed_dialog
by Philipp Hörist 28 Sep '19

28 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3de999d9 by Daniel Brötzmann at 2019-09-25T16:32:05Z Fix show_unsubscribed_dialog - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -405,9 +405,8 @@ class Interface: % obj.jid) def show_unsubscribed_dialog(self, account, contact): - def _remove(list_): - self.roster.on_req_usub(None, list_) - list_ = [(contact, account)] + def _remove(): + self.roster.on_req_usub(None, [(contact, account)]) NewConfirmationDialog( _('Subscription Removed'), @@ -417,7 +416,7 @@ class Interface: [DialogButton.make('Cancel', text=_('_No')), DialogButton.make('Remove', - callback=_remove(list_))]).show() + callback=_remove)]).show() # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does # not show deny View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3de999d93b9203304496f709b531eb3af0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3de999d93b9203304496f709b531eb3af0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Presence: Dont show SubscriptionRequestWindow on auto approve
by Philipp Hörist 24 Sep '19

24 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3647524a by Philipp Hörist at 2019-09-24T16:31:58Z Presence: Dont show SubscriptionRequestWindow on auto approve - - - - - 1 changed file: - gajim/common/modules/presence.py Changes: ===================================== gajim/common/modules/presence.py ===================================== @@ -250,6 +250,8 @@ class Presence(BaseModule): if auto_auth or is_transport or jid in self.jids_for_auto_auth: self.send_presence(fjid, 'subscribed') + self._log.info('Auto respond with subscribed: %s', jid) + return status = (properties.status or _('I would like to add you to my roster.')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3647524ad328cdd971d1c286d8dbb0b56d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3647524ad328cdd971d1c286d8dbb0b56d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CI: Disable pylint E1133 for now
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 40ea0c9d by Philipp Hörist at 2019-09-23T20:34:03Z CI: Disable pylint E1133 for now see https://gitlab.gnome.org/GNOME/pygobject/issues/361 - - - - - 1 changed file: - scripts/dev/pylint-ci.sh Changes: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -2,7 +2,7 @@ PYLINT=${PYLINT:-pylint} "$PYLINT" --version -"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" +"$PYLINT" --disable=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 "$@" # C0103 invalid-name # C0301 line-too-long @@ -11,6 +11,7 @@ PYLINT=${PYLINT:-pylint} # E0401 import-error # E0611 no-name-in-module # E1101 no-member +# E1133 not-an-iterable # E1136 unsubscriptable-object # R0201 no-self-use # R0901 too-many-ancestors View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/40ea0c9dae3bd0c0213c744c64eb6c357d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/40ea0c9dae3bd0c0213c744c64eb6c357d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CI: Disable pylint E1136 for now
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a01c130a by Philipp Hörist at 2019-09-23T20:23:36Z CI: Disable pylint E1136 for now This reports a false positiv, see https://gitlab.gnome.org/GNOME/pygobject/issues/361 - - - - - 1 changed file: - scripts/dev/pylint-ci.sh Changes: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -2,7 +2,7 @@ PYLINT=${PYLINT:-pylint} "$PYLINT" --version -"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" +"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" # C0103 invalid-name # C0301 line-too-long @@ -11,6 +11,7 @@ PYLINT=${PYLINT:-pylint} # E0401 import-error # E0611 no-name-in-module # E1101 no-member +# E1136 unsubscriptable-object # R0201 no-self-use # R0901 too-many-ancestors # R0904 too-many-public-methods View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a01c130afad9965977cd41534a821b380c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a01c130afad9965977cd41534a821b380c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update gitlab-ci.yml
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d4f0a58 by Philipp Hörist at 2019-09-23T19:36:15Z Update gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -15,7 +15,7 @@ run-tests: - pip3 install mypy - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master - pip3 install pylint==2.3.1 - - mypy gajim + - /home/gitlab-runner/.local/bin/mypy gajim - scripts/dev/pylint-ci.sh --jobs=2 gajim - python3 setup.py test -s test.no_gui - deactivate View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d4f0a58aba1a981e85684b2f99e596451… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d4f0a58aba1a981e85684b2f99e596451… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pylint-ci.sh
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e37087a by Philipp Hörist at 2019-09-23T19:16:49Z Update pylint-ci.sh - - - - - 1 changed file: - scripts/dev/pylint-ci.sh Changes: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -1,6 +1,7 @@ #!/bin/sh PYLINT=${PYLINT:-pylint} +"$PYLINT" --version "$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" # C0103 invalid-name @@ -10,8 +11,6 @@ PYLINT=${PYLINT:-pylint} # E0401 import-error # E0611 no-name-in-module # E1101 no-member -# E1133 not-an-iterable -# E1136 unsubscriptable-object # R0201 no-self-use # R0901 too-many-ancestors # R0904 too-many-public-methods View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e37087a0670a65b863756f59341ac4325… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e37087a0670a65b863756f59341ac4325… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Groupchat: Remove traces of continued conversations
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9922ce1d by Philipp Hörist at 2019-09-23T15:16:23Z Groupchat: Remove traces of continued conversations - - - - - ca328a67 by Philipp Hörist at 2019-09-23T15:20:19Z Groupchat: Remove unused argument - - - - - 19e862c2 by Philipp Hörist at 2019-09-23T18:17:46Z Update pylint-ci.sh - - - - - 4 changed files: - gajim/common/events.py - gajim/groupchat_control.py - gajim/gtk/dialogs.py - scripts/dev/pylint-ci.sh Changes: ===================================== gajim/common/events.py ===================================== @@ -44,7 +44,7 @@ class Event: printed_chat: [message, subject, control, msg_log_id] printed_*: None messages that are already printed in chat, but not read - gc-invitation: [room_jid, reason, password, is_continued, jid_from] + gc-invitation: [room_jid, reason, password, jid_from] subscription_request: [text, nick] unsubscribed: contact jingle-incoming: (fulljid, sessionid, content_types) ===================================== gajim/groupchat_control.py ===================================== @@ -87,11 +87,10 @@ class GroupchatControl(ChatControlBase): # will be processed with this command host. COMMAND_HOST = GroupChatCommands - def __init__(self, parent_win, contact, muc_data, acct, is_continued=False): + def __init__(self, parent_win, contact, muc_data, acct): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, - 'groupchat_control', contact, acct) + 'groupchat_control', contact, acct) self.force_non_minimizable = False - self.is_continued = is_continued self.is_anonymous = True # Keep error dialog instance to be sure to have only once at a time @@ -760,12 +759,7 @@ class GroupchatControl(ChatControlBase): and not self.attention_flag: color = 'tab-muc-msg' - if self.is_continued: - # if this is a continued conversation - label_str = self.get_continued_conversation_name() - else: - label_str = self.room_name - label_str = GLib.markup_escape_text(label_str) + label_str = GLib.markup_escape_text(self.room_name) # count waiting highlighted messages unread = '' @@ -829,23 +823,6 @@ class GroupchatControl(ChatControlBase): self.xml.gc_banner_status_image.set_from_surface(surface) - def get_continued_conversation_name(self): - """ - Get the name of a continued conversation. Will return Continued - Conversation if there isn't any other contact in the room - """ - nicks = [] - for nick in app.contacts.get_nick_list(self.account, - self.room_jid): - if nick != self.nick: - nicks.append(nick) - if nicks != []: - title = ', ' - title = _('Conversation with ') + title.join(nicks) - else: - title = _('Continued conversation') - return title - def draw_banner_text(self): """ Draw the text in the fat line at the top of the window that houses the @@ -1638,7 +1615,7 @@ class GroupchatControl(ChatControlBase): return app.config.get_per('rooms', self.contact.jid, 'minimize_on_close', True) - def minimize(self, status='offline'): + def minimize(self): # Minimize it win = app.interface.msg_win_mgr.get_window(self.contact.jid, self.account) ===================================== gajim/gtk/dialogs.py ===================================== @@ -603,7 +603,6 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): self.room_jid = str(event.muc) self.from_ = str(event.from_) self.password = event.password - self.is_continued = event.continued if event.from_.bareMatch(event.muc): contact_text = event.from_.getResource() @@ -615,15 +614,10 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): else: contact_text = contact.get_shown_name() - # is_continued when invited from 1:1 chat - if self.is_continued: - invitation_label = _('%s has invited you to join ' - 'a discussion') % contact_text - else: - invitation_label = _('%(contact)s has invited you to the ' - 'group chat %(room_jid)s') % \ - {'contact': contact_text, - 'room_jid': self.room_jid} + invitation_label = _('%(contact)s has invited you to the ' + 'group chat %(room_jid)s') % \ + {'contact': contact_text, + 'room_jid': self.room_jid} self._ui.invitation_label.set_markup(invitation_label) if event.reason: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -1,7 +1,7 @@ #!/bin/sh PYLINT=${PYLINT:-pylint} -"$PYLINT" --disable=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 "$@" +"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" # C0103 invalid-name # C0301 line-too-long View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/44e6b0f0048f176ea2ede69302903033f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/44e6b0f0048f176ea2ede69302903033f… 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