diff options
| author | fiaxh <git@lightrise.org> | 2022-01-08 21:35:58 +0100 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2022-01-08 21:35:58 +0100 |
| commit | 975b37c498f2611bc7f13017d4491961426a8a7f (patch) | |
| tree | 8cbc42c8fcfc2873166d9f3b4d5cadb99fcb5480 /xmpp-vala/src/module/xep | |
| parent | e40de726312638b1410da6e4b21d6a8ce818eddc (diff) | |
| download | dino-975b37c498f2611bc7f13017d4491961426a8a7f.tar.gz dino-975b37c498f2611bc7f13017d4491961426a8a7f.zip | |
Stop making superfluous requests when joining a MUC
Don't request legacy bookmarks on every muc join (when again setting autojoin) fixes #260
Don't query member/admin/owner affiliations on every MUC join
Diffstat (limited to 'xmpp-vala/src/module/xep')
| -rw-r--r-- | xmpp-vala/src/module/xep/0045_muc/module.vala | 6 | ||||
| -rw-r--r-- | xmpp-vala/src/module/xep/0048_bookmarks.vala | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/xmpp-vala/src/module/xep/0045_muc/module.vala b/xmpp-vala/src/module/xep/0045_muc/module.vala index c9445f7e..e8711742 100644 --- a/xmpp-vala/src/module/xep/0045_muc/module.vala +++ b/xmpp-vala/src/module/xep/0045_muc/module.vala @@ -342,11 +342,6 @@ public class Module : XmppStreamModule { if (status_codes.contains(StatusCode.SELF_PRESENCE)) { Jid bare_jid = presence.from.bare_jid; if (flag.get_enter_id(bare_jid) != null) { - - query_affiliation.begin(stream, bare_jid, "member"); - query_affiliation.begin(stream, bare_jid, "admin"); - query_affiliation.begin(stream, bare_jid, "owner"); - flag.finish_muc_enter(bare_jid); var join_result = new JoinResult() { nick=presence.from.resourcepart, newly_created=status_codes.contains(StatusCode.NEW_ROOM_CREATED) }; flag.enter_futures[bare_jid].set_value(join_result); @@ -458,7 +453,6 @@ public class Module : XmppStreamModule { .put_attribute("affiliation", affiliation)) ) { to=jid }; - Iq.Stanza iq_result = yield stream.get_module(Iq.Module.IDENTITY).send_iq_async(stream, iq); if (iq_result.is_error()) return null; diff --git a/xmpp-vala/src/module/xep/0048_bookmarks.vala b/xmpp-vala/src/module/xep/0048_bookmarks.vala index 90a0c2e7..46814e4a 100644 --- a/xmpp-vala/src/module/xep/0048_bookmarks.vala +++ b/xmpp-vala/src/module/xep/0048_bookmarks.vala @@ -7,7 +7,6 @@ public class Module : BookmarksProvider, XmppStreamModule { public static ModuleIdentity<Module> IDENTITY = new ModuleIdentity<Module>(NS_URI, "0048_bookmarks_module"); public async Set<Conference>? get_conferences(XmppStream stream) { - StanzaNode get_node = new StanzaNode.build("storage", NS_URI).add_self_xmlns(); StanzaNode? result_node = yield stream.get_module(PrivateXmlStorage.Module.IDENTITY).retrieve(stream, get_node); if (result_node == null) return null; @@ -38,7 +37,7 @@ public class Module : BookmarksProvider, XmppStreamModule { conference_node.put_node(new StanzaNode.build("nick", NS_URI) .put_node(new StanzaNode.text(conference.nick))); } - // TODO (?) Bookmarks 2 currently don't define a password + // TODO (?) Bookmarks 2 currently doesn't define a password storage_node.put_node(conference_node); } } |