Changeset fc0640e for protocols/jabber

Timestamp:

2012-02-10T18:00:00Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b5fe39b

Parents:

bb2d198

Message:

Support for "nameless" chatrooms on Jabber.

Just join #somechannel and start inviting people. It should Just Work,
like on other IM networks. Works at least with GTalk and with other
servers that have conference stuff installed on conference.$servername.

Location:

protocols/jabber

Files:

• conference.c (modified) (4 diffs)
• jabber.c (modified) (2 diffs)
• jabber.h (modified) (2 diffs)

protocols/jabber/conference.c

@@ -23 +23 @@
 
 #include "jabber.h"
+#include "sha1.h"
 
 static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
@@ -68 +69 @@
 }
 
+struct groupchat *jabber_chat_with( struct im_connection *ic, char *who )
+{
+        struct jabber_data *jd = ic->proto_data;
+        struct jabber_chat *jc;
+        struct groupchat *c;
+        sha1_state_t sum;
+        double now = gettime();
+        char *uuid, *rjid, *cserv;
+        
+        sha1_init( &sum );
+        sha1_append( &sum, (uint8_t*) ic->acc->user, strlen( ic->acc->user ) );
+        sha1_append( &sum, (uint8_t*) &now, sizeof( now ) );
+        sha1_append( &sum, (uint8_t*) who, strlen( who ) );
+        uuid = sha1_random_uuid( &sum );
+        
+        if( jd->flags & JFLAG_GTALK )
+                cserv = g_strdup( "groupchat.google.com" );
+        else
+                /* Guess... */
+                cserv = g_strdup_printf( "conference.%s", jd->server );
+        
+        rjid = g_strdup_printf( "private-chat-%s@%s", uuid, cserv );
+        g_free( uuid );
+        g_free( cserv );
+        
+        c = jabber_chat_join( ic, rjid, jd->username, NULL );
+        g_free( rjid );
+        if( c == NULL )
+                return NULL;
+        
+        jc = c->data;
+        jc->invite = g_strdup( who );
+        
+        return c;
+}
+
 static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
 {
@@ -116 +153 @@
         g_free( jc->my_full_jid );
         g_free( jc->name );
+        g_free( jc->invite );
         g_free( jc );
         
@@ -283 +321 @@
                 }
                 
+                if( bud == jc->me && jc->invite != NULL )
+                {
+                        char *msg = g_strdup_printf( "Please join me in room %s", jc->name );
+                        jabber_chat_invite( chat, jc->invite, msg );
+                        g_free( jc->invite );
+                        g_free( msg );
+                        jc->invite = NULL;
+                }
+                
                 s = strchr( bud->ext_jid, '/' );
                 if( s ) *s = 0; /* Should NEVER be NULL, but who knows... */

protocols/jabber/jabber.c

@@ -483 +483 @@
 }
 
+static struct groupchat *jabber_chat_with_( struct im_connection *ic, char *who )
+{
+        return jabber_chat_with( ic, who );
+}
+
 static void jabber_chat_msg_( struct groupchat *c, char *message, int flags )
 {
@@ -635 +640 @@
         ret->chat_leave = jabber_chat_leave_;
         ret->chat_join = jabber_chat_join_;
+        ret->chat_with = jabber_chat_with_;
         ret->chat_add_settings = jabber_chat_add_settings;
         ret->chat_free_settings = jabber_chat_free_settings;

protocols/jabber/jabber.h

@@ -163 +163 @@
         char *my_full_jid; /* Separate copy because of case sensitivity. */
         struct jabber_buddy *me;
+        char *invite;
 };
 
@@ -339 +340 @@
 /* conference.c */
 struct groupchat *jabber_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password );
+struct groupchat *jabber_chat_with( struct im_connection *ic, char *who );
 struct groupchat *jabber_chat_by_jid( struct im_connection *ic, const char *name );
 void jabber_chat_free( struct groupchat *c );