Changeset 7801298

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!

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• irc_im.c (modified) (1 diff)
• protocols/account.c (modified) (1 diff)
• protocols/bee_user.c (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -1008 +1008 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="handle_unknown" type="string" scope="global">
+        <bitlbee-setting name="handle_unknown" type="string" scope="account,global">
                 <default>add_channel</default>
-                <possible-values>root, add, add_private, add_channel, ignore</possible-values>
-
-                <description>
-                        <para>
-                                By default, messages from people who aren't in your contact list are shown in a control channel instead of as a private message.
+                <possible-values>add_private, add_channel, ignore</possible-values>
+
+                <description>
+                        <para>
+                                By default, messages from people who aren't in your contact list are shown in a control channel (add_channel) instead of as a private message (add_private)
                         </para>
 
                         <para>
                                 If you prefer to ignore messages from people you don't know, you can set this one to "ignore". "add_private" and "add_channel" are like add, but you can use them to make messages from unknown buddies appear in the channel instead of a query window.
+                        </para>
+
+                        <para>
+                                This can be set to individual accounts, which is useful to only ignore accounts that are targeted by spammers, without missing messages from legitimate unknown contacts in others. Note that incoming add requests are visible regardless of this setting.
                         </para>
 

irc_im.c

@@ -89 +89 @@
 
         if (bu->flags & BEE_USER_LOCAL) {
-                char *s = set_getstr(&bee->set, "handle_unknown");
-
-                if (strcmp(s, "add_private") == 0) {
+                char *s = set_getstr(&bu->ic->acc->set, "handle_unknown") ? :
+                          set_getstr(&bee->set, "handle_unknown");
+
+                if (g_strcasecmp(s, "add_private") == 0) {
                         iu->last_channel = NULL;
-                } else if (strcmp(s, "add_channel") == 0) {
+                } else if (g_strcasecmp(s, "add_channel") == 0) {
                         iu->last_channel = irc->default_channel;
                 }

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) {