Changeset 21a328ab for protocols/jabber/iq.c

Timestamp:

2021-04-16T10:15:47Z (4 years ago)

Author:

/ <>

Parents:

2378eca2 (diff), 416b973 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jabberblock' into integration_tests

File:

• protocols/jabber/iq.c (modified) (3 diffs)

protocols/jabber/iq.c

@@ -1007 +1007 @@
 {
         struct jabber_data *jd = ic->proto_data;
+    struct prpl *prpl = ic->acc->prpl;
         struct xt_node *query, *id, *c;
         char *feature;
@@ -1014 +1015 @@
         }
 
-        c = query->children;
-
-        while ((c = xt_find_node(c, "feature"))) {
-                feature = xt_find_attr(c, "var");
-                if (feature) {
-                        jd->features = g_slist_append(jd->features, g_strdup(feature));
-                }
-                c = c->next;
-        }
+    if (xt_find_node_by_attr(query->children, "feature", "var", XMLNS_BLOCK)) {
+        prpl->add_deny = jabber_buddy_block;
+        prpl->rem_deny = jabber_buddy_unblock;
+        prpl->add_permit = jabber_buddy_permit;
+        prpl->rem_permit = jabber_buddy_unpermit;
+    }
 
         if (xt_find_node_by_attr(query->children, "feature", "var", XMLNS_CARBONS) &&
@@ -1051 +1049 @@
                 }
         }
-
-        jabber_block_feature(ic);
 
         return XT_HANDLED;