Changeset be1efa3 for protocols/jabber

Timestamp:

2015-01-26T02:43:34Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

fcb2c2e

Parents:

8519f45

git-author:

dequis <dx@…> (20-07-14 06:28:49)

git-committer:

dequis <dx@…> (26-01-15 02:43:34)

Message:

Add handle_is_self() prpl function to fix JID mismatch confusion bugs

When bee_chat needs to check for self messages, it can call this
function to let the protocol implementation do the comparison.

In the case of jabber, sometimes the server reports a different username
after login, this one is stored in jd->internal_jid, and the one that is
used for login isn't changed

Location:

protocols/jabber

Files:

• iq.c (modified) (1 diff)
• jabber.c (modified) (3 diffs)
• jabber.h (modified) (1 diff)
• jabber_util.c (modified) (1 diff)

protocols/jabber/iq.c

@@ -358 +358 @@
                                 *s = '\0';
                         jabber_set_me( ic, c->text );
-                        imcb_log( ic, "Server claims your JID is `%s' instead of `%s'. "
-                                  "This mismatch may cause problems with groupchats "
-                                  "and possibly other things.",
-                                  c->text, ic->acc->user );
                         if( s )
                                 *s = '/';

protocols/jabber/jabber.c

@@ -318 +318 @@
         g_free( jd->oauth2_access_token );
         g_free( jd->away_message );
+        g_free( jd->internal_jid );
         g_free( jd->username );
         g_free( jd->me );
@@ -619 +620 @@
         
         return NULL;
+}
+
+gboolean jabber_handle_is_self( struct im_connection *ic, const char *who ) {
+        struct jabber_data *jd = ic->proto_data;
+        return ( ( g_strcasecmp( who, ic->acc->user ) == 0 ) ||
+                 ( jd->internal_jid &&
+                   g_strcasecmp( who, jd->internal_jid ) == 0 ) );
 }
 
@@ -648 +656 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->handle_is_self = jabber_handle_is_self;
         ret->transfer_request = jabber_si_transfer_request;
         ret->buddy_action_list = jabber_buddy_action_list;

protocols/jabber/jabber.h

@@ -97 +97 @@
         char *server;           /* username@SERVER -=> server/domain, not hostname */
         char *me;               /* bare jid */
+        char *internal_jid;
         
         const struct oauth2_service *oauth2_service;

protocols/jabber/jabber_util.c

@@ -824 +824 @@
         jd->username = g_strndup( jd->me, jd->server - jd->me );
         jd->server ++;
+
+        /* Set the "internal" account username, for groupchats */
+        g_free( jd->internal_jid );
+        jd->internal_jid = g_strdup( jd->me );
         
         return TRUE;