aboutsummaryrefslogtreecommitdiff
path: root/xmpp-vala
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2019-08-08 03:17:34 +0200
committerfiaxh <git@lightrise.org>2019-08-09 13:44:39 +0200
commit3ad2891eb80d9381fed8547d6429904120af1f3e (patch)
treeac88a05f3a88c82f0ea4af3ce26bb300bd90b85c /xmpp-vala
parentcd5c3e28a8f488dce80afc9d8ddf32d7da4af6eb (diff)
downloaddino-3ad2891eb80d9381fed8547d6429904120af1f3e.tar.gz
dino-3ad2891eb80d9381fed8547d6429904120af1f3e.zip
Set OMEMO devicelist + bundle node access model to public
Diffstat (limited to 'xmpp-vala')
-rw-r--r--xmpp-vala/src/module/xep/0060_pubsub.vala33
-rw-r--r--xmpp-vala/src/module/xep/0084_user_avatars.vala4
2 files changed, 34 insertions, 3 deletions
diff --git a/xmpp-vala/src/module/xep/0060_pubsub.vala b/xmpp-vala/src/module/xep/0060_pubsub.vala
index e887f74f..91f5525d 100644
--- a/xmpp-vala/src/module/xep/0060_pubsub.vala
+++ b/xmpp-vala/src/module/xep/0060_pubsub.vala
@@ -3,6 +3,13 @@ using Gee;
namespace Xmpp.Xep.Pubsub {
private const string NS_URI = "http://jabber.org/protocol/pubsub";
private const string NS_URI_EVENT = NS_URI + "#event";
+ private const string NS_URI_OWNER = NS_URI + "#owner";
+
+ public const string ACCESS_MODEL_AUTHORIZE = "authorize";
+ public const string ACCESS_MODEL_OPEN = "open";
+ public const string ACCESS_MODEL_PRESENCE = "presence";
+ public const string ACCESS_MODEL_ROSTER = "roster";
+ public const string ACCESS_MODEL_WHITELIST = "whitelist";
public class Module : XmppStreamModule {
public static ModuleIdentity<Module> IDENTITY = new ModuleIdentity<Module>(NS_URI, "0060_pubsub_module");
@@ -27,7 +34,7 @@ namespace Xmpp.Xep.Pubsub {
});
}
- public void publish(XmppStream stream, Jid? jid, string node_id, string node, string? item_id, StanzaNode content) {
+ public void publish(XmppStream stream, Jid? jid, string node_id, string? item_id, StanzaNode content, string? access_model=null) {
StanzaNode pubsub_node = new StanzaNode.build("pubsub", NS_URI).add_self_xmlns();
StanzaNode publish_node = new StanzaNode.build("publish", NS_URI).put_attribute("node", node_id);
pubsub_node.put_node(publish_node);
@@ -35,6 +42,30 @@ namespace Xmpp.Xep.Pubsub {
if (item_id != null) items_node.put_attribute("id", item_id);
items_node.put_node(content);
publish_node.put_node(items_node);
+
+ if (access_model != null) {
+ StanzaNode publish_options_node = new StanzaNode.build("publish-options", NS_URI);
+ pubsub_node.put_node(publish_options_node);
+
+ DataForms.DataForm data_form = new DataForms.DataForm();
+ DataForms.DataForm.HiddenField form_type_field = new DataForms.DataForm.HiddenField() { var="FORM_TYPE" };
+ form_type_field.set_value_string(NS_URI + "#publish-options");
+ data_form.add_field(form_type_field);
+ DataForms.DataForm.Field field = new DataForms.DataForm.Field() { var="pubsub#access_model" };
+ field.set_value_string(access_model);
+ data_form.add_field(field);
+ publish_options_node.put_node(data_form.get_submit_node());
+ }
+
+ Iq.Stanza iq = new Iq.Stanza.set(pubsub_node);
+ stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, null);
+ }
+
+ public void delete_node(XmppStream stream, Jid? jid, string node_id) {
+ StanzaNode pubsub_node = new StanzaNode.build("pubsub", NS_URI_OWNER).add_self_xmlns();
+ StanzaNode publish_node = new StanzaNode.build("delete", NS_URI_OWNER).put_attribute("node", node_id);
+ pubsub_node.put_node(publish_node);
+
Iq.Stanza iq = new Iq.Stanza.set(pubsub_node);
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, null);
}
diff --git a/xmpp-vala/src/module/xep/0084_user_avatars.vala b/xmpp-vala/src/module/xep/0084_user_avatars.vala
index ed35dc44..51c2a563 100644
--- a/xmpp-vala/src/module/xep/0084_user_avatars.vala
+++ b/xmpp-vala/src/module/xep/0084_user_avatars.vala
@@ -18,7 +18,7 @@ namespace Xmpp.Xep.UserAvatars {
string sha1 = Checksum.compute_for_data(ChecksumType.SHA1, image);
StanzaNode data_node = new StanzaNode.build("data", NS_URI_DATA).add_self_xmlns()
.put_node(new StanzaNode.text(Base64.encode(image)));
- stream.get_module(Pubsub.Module.IDENTITY).publish(stream, null, NS_URI_DATA, NS_URI_DATA, sha1, data_node);
+ stream.get_module(Pubsub.Module.IDENTITY).publish(stream, null, NS_URI_DATA, sha1, data_node);
StanzaNode metadata_node = new StanzaNode.build("metadata", NS_URI_METADATA).add_self_xmlns();
StanzaNode info_node = new StanzaNode.build("info", NS_URI_METADATA)
@@ -28,7 +28,7 @@ namespace Xmpp.Xep.UserAvatars {
.put_attribute("height", height.to_string())
.put_attribute("type", "image/png");
metadata_node.put_node(info_node);
- stream.get_module(Pubsub.Module.IDENTITY).publish(stream, null, NS_URI_METADATA, NS_URI_METADATA, sha1, metadata_node);
+ stream.get_module(Pubsub.Module.IDENTITY).publish(stream, null, NS_URI_METADATA, sha1, metadata_node);
}
public override void attach(XmppStream stream) {