Changeset 7801298 for protocols

Timestamp:

2016-12-27T17:24:50Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

2e8523b

Parents:

9cdcef0

Message:

Per-account handle_unknown

Credit for the idea goes to russian XMPP spammers. Thanks!

Location:

protocols

Files:

• account.c (modified) (1 diff)
• bee_user.c (modified) (2 diffs)

protocols/account.c

@@ -59 +59 @@
 
         s = set_add(&a->set, "auto_reconnect", "true", set_eval_bool, a);
+
+        s = set_add(&a->set, "handle_unknown", NULL, NULL, a);
+        s->flags |= SET_NULL_OK;
 
         s = set_add(&a->set, "nick_format", NULL, NULL, a);

protocols/bee_user.c

@@ -170 +170 @@
 
         if (!(bu = bee_user_by_handle(bee, ic, handle))) {
-                if (g_strcasecmp(set_getstr(&ic->bee->set, "handle_unknown"), "add") == 0) {
+                char *h = set_getstr(&ic->acc->set, "handle_unknown") ? :
+                          set_getstr(&ic->bee->set, "handle_unknown");
+
+                if (g_strncasecmp(h, "add", 3) == 0) {
                         bu = bee_user_new(bee, ic, handle, BEE_USER_LOCAL);
                 } else {
-                        if (g_strcasecmp(set_getstr(&ic->bee->set, "handle_unknown"), "ignore") != 0) {
+                        if (g_strcasecmp(h, "ignore") != 0) {
                                 imcb_log(ic, "imcb_buddy_status() for unknown handle %s:\n"
                                          "flags = %d, state = %s, message = %s", handle, flags,
@@ -255 +258 @@
 
         if (!bu && !(ic->flags & OPT_LOGGING_OUT)) {
-                char *h = set_getstr(&bee->set, "handle_unknown");
+                char *h = set_getstr(&ic->acc->set, "handle_unknown") ? :
+                          set_getstr(&ic->bee->set, "handle_unknown");
 
                 if (g_strcasecmp(h, "ignore") == 0) {