diff --git a/frontends/src/jp/cmd_pubsub.py b/frontends/src/jp/cmd_pubsub.py index 6e50af11..4ac38fab 100644 --- a/frontends/src/jp/cmd_pubsub.py +++ b/frontends/src/jp/cmd_pubsub.py @@ -658,14 +658,17 @@ class Subscribe(base.CommandBase): def add_parser_options(self): pass - def psSubscribeCb(self): + def psSubscribeCb(self, sub_id): self.disp(_(u'subscription done'), 1) + if sub_id: + self.disp(_(u'subscription id: {sub_id}').format(sub_id=sub_id)) self.host.quit() def start(self): self.host.bridge.psSubscribe( self.args.service, self.args.node, + {}, self.profile, callback=self.psSubscribeCb, errback=partial(self.errback, diff --git a/src/plugins/plugin_xep_0060.py b/src/plugins/plugin_xep_0060.py index 3db85c92..bb5f5b37 100755 --- a/src/plugins/plugin_xep_0060.py +++ b/src/plugins/plugin_xep_0060.py @@ -98,7 +98,7 @@ class XEP_0060(object): host.bridge.addMethod("psItemSend", ".plugin", in_sign='ssssa{ss}s', out_sign='s', method=self._sendItem, async=True) host.bridge.addMethod("psRetractItem", ".plugin", in_sign='sssbs', out_sign='', method=self._retractItem, async=True) host.bridge.addMethod("psRetractItems", ".plugin", in_sign='ssasbs', out_sign='', method=self._retractItems, async=True) - host.bridge.addMethod("psSubscribe", ".plugin", in_sign='sss', out_sign='', method=self._subscribe, async=True) + host.bridge.addMethod("psSubscribe", ".plugin", in_sign='ssa{ss}s', out_sign='s', method=self._subscribe, async=True) host.bridge.addMethod("psUnsubscribe", ".plugin", in_sign='sss', out_sign='', method=self._unsubscribe, async=True) host.bridge.addMethod("psSubscriptionsGet", ".plugin", in_sign='sss', out_sign='aa{ss}', method=self._subscriptions, async=True) host.bridge.addMethod("psSubscribeToMany", ".plugin", in_sign='a(ss)sa{ss}s', out_sign='s', method=self._subscribeToMany) @@ -587,10 +587,12 @@ class XEP_0060(object): client = self.host.getClient(profile_key) return client.pubsub_client.retractItems(service, nodeIdentifier, itemIdentifiers, notify=True) - def _subscribe(self, service, nodeIdentifier, profile_key=C.PROF_KEY_NONE): + def _subscribe(self, service, nodeIdentifier, options, profile_key=C.PROF_KEY_NONE): client = self.host.getClient(profile_key) service = None if not service else jid.JID(service) - return self.subscribe(client, service, nodeIdentifier) + d = self.subscribe(client, service, nodeIdentifier, options=options or None) + d.addCallback(lambda subscription: subscription.subscriptionIdentifier or u'') + return d def subscribe(self, client, service, nodeIdentifier, sub_jid=None, options=None): # TODO: reimplement a subscribtion cache, checking that we have not subscription before trying to subscribe