Changeset 3320d6d

Timestamp:

2016-03-20T03:58:05Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

4e0e590

Parents:

63825d6

git-author:

dequis <dx@…> (10-03-16 05:20:31)

git-committer:

dequis <dx@…> (20-03-16 03:58:05)

Message:

jabber: Add "always_use_nicks" setting, for non-anonymous MUCs

Basically the same thing as github PR #55, which fixes trac bug 415,
but this one conditionalized that behavior and uses the API introduced a
few commits ago.

I didn't think too much about the setting name and i'm open to changing
it to anything else

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/jabber/conference.c (modified) (4 diffs)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -649 +649 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="always_use_nicks" type="boolean" scope="channel">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                Jabber groupchat specific. This setting ensures that the nicks defined by the other members of a groupchat are used, instead of the username part of their JID. This only applies to groupchats where their real JID is known (either "non-anonymous" ones, or "semi-anonymous" from the point of view of the channel moderators)
+                        </para>
+
+                        <para>
+                                Enabling this may have the side effect of changing the nick of existing contacts, either in your buddy list or in other groupchats. If a contact is in multiple groupchats with different nicks, enabling this setting for all those would result in multiple nick changes when joining, and the order of those changes may vary.
+                        </para>
+
+                        <para>
+                                Note that manual nick changes done through the <emphasis>rename</emphasis> command always take priority
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="auto_connect" type="boolean" scope="account,global">
                 <default>true</default>

protocols/jabber/conference.c

@@ -28 +28 @@
 static xt_status jabber_chat_self_message(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
-struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password)
+struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password,
+                                   gboolean always_use_nicks)
 {
         struct jabber_chat *jc;
@@ -57 +58 @@
                 g_free(jc);
                 return NULL;
+        }
+
+        if (always_use_nicks) {
+                jc->flags = JCFLAG_ALWAYS_USE_NICKS;
         }
 
@@ -95 +100 @@
         g_free(cserv);
 
-        c = jabber_chat_join(ic, rjid, jd->username, NULL);
+        c = jabber_chat_join(ic, rjid, jd->username, NULL, FALSE);
         g_free(rjid);
         if (c == NULL) {
@@ -341 +346 @@
                         *s = 0; /* Should NEVER be NULL, but who knows... */
                 }
+
+                if (bud != jc->me && (jc->flags & JCFLAG_ALWAYS_USE_NICKS) && !(bud->flags & JBFLAG_IS_ANONYMOUS)) {
+                        imcb_buddy_nick_change(ic, bud->ext_jid, bud->resource);
+                }
+
                 imcb_chat_add_buddy(chat, bud->ext_jid);
                 if (s) {

protocols/jabber/jabber.c

@@ -577 +577 @@
         } else {
                 /* jabber_chat_join without the underscore is the conference.c one */
-                return jabber_chat_join(ic, room, final_nick, set_getstr(sets, "password"));
+                return jabber_chat_join(ic, room, final_nick, set_getstr(sets, "password"),
+                                        set_getbool(sets, "always_use_nicks"));
         }
 
@@ -686 +687 @@
 void jabber_chat_add_settings(account_t *acc, set_t **head)
 {
+        set_add(head, "always_use_nicks", "false", set_eval_bool, NULL);
+
         /* Meh. Stupid room passwords. Not trying to obfuscate/hide
            them from the user for now. */
@@ -693 +696 @@
 void jabber_chat_free_settings(account_t *acc, set_t **head)
 {
+        set_del(head, "always_use_nicks");
+
         set_del(head, "password");
 }

protocols/jabber/jabber.h

@@ -75 +75 @@
         JCFLAG_MESSAGE_SENT = 1,        /* Set this after sending the first message, so
                                            we can detect echoes/backlogs. */
+        JCFLAG_ALWAYS_USE_NICKS = 2,
 } jabber_chat_flags_t;
 
@@ -343 +344 @@
 
 /* conference.c */
-struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password);
+struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password,
+                                   gboolean always_use_nicks);
 struct groupchat *jabber_chat_with(struct im_connection *ic, char *who);
 struct groupchat *jabber_chat_by_jid(struct im_connection *ic, const char *name);