Changeset 1aa74f55 for protocols

Timestamp:

2010-08-23T10:34:36Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

bd599b9

Parents:

241f9f6

Message:

Process incoming XMPP groupchat invites in a saner way: Create a temporary
channel the user can easily /join.

Location:

protocols

Files:

• bee.h (modified) (2 diffs)
• bee_chat.c (modified) (1 diff)
• jabber/message.c (modified) (3 diffs)

protocols/bee.h

@@ -123 +123 @@
         gboolean (*chat_topic)( bee_t *bee, struct groupchat *c, const char *new, bee_user_t *bu );
         gboolean (*chat_name_hint)( bee_t *bee, struct groupchat *c, const char *name );
+        gboolean (*chat_invite)( bee_t *bee, bee_user_t *bu, const char *name, const char *msg );
         
         struct file_transfer* (*ft_in_start)( bee_t *bee, bee_user_t *bu, const char *file_name, size_t file_size );
@@ -175 +176 @@
 G_MODULE_EXPORT int bee_chat_msg( bee_t *bee, struct groupchat *c, const char *msg, int flags );
 G_MODULE_EXPORT struct groupchat *bee_chat_by_title( bee_t *bee, struct im_connection *ic, const char *title );
+G_MODULE_EXPORT void imcb_chat_invite( struct im_connection *ic, const char *name, const char *who, const char *msg );
 
 #endif /* __BEE_H__ */

protocols/bee_chat.c

@@ -233 +233 @@
         return NULL;
 }
+
+void imcb_chat_invite( struct im_connection *ic, const char *name, const char *who, const char *msg )
+{
+        bee_user_t *bu = bee_user_by_handle( ic->bee, ic, who );
+        
+        if( bu && ic->bee->ui->chat_invite )
+                ic->bee->ui->chat_invite( ic->bee, bu, name, msg );
+}

protocols/jabber/message.c

@@ -31 +31 @@
         struct xt_node *body = xt_find_node( node->children, "body" ), *c;
         struct jabber_buddy *bud = NULL;
-        char *s;
+        char *s, *room = NULL, *reason = NULL;
         
         if( !from )
@@ -52 +52 @@
                 for( c = node->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
                 {
-                        char *ns = xt_find_attr( c, "xmlns" ), *room;
-                        struct xt_node *inv, *reason;
+                        char *ns = xt_find_attr( c, "xmlns" );
+                        struct xt_node *inv;
                         
                         if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 &&
                             ( inv = xt_find_node( c->children, "invite" ) ) )
                         {
+                                /* This is an invitation. Set some vars which
+                                   will be passed to imcb_chat_invite() below. */
                                 room = from;
                                 if( ( from = xt_find_attr( inv, "from" ) ) == NULL )
                                         from = room;
-
-                                g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room );
-                                if( ( reason = xt_find_node( inv->children, "reason" ) ) && reason->text_len > 0 )
-                                        g_string_append( fullmsg, reason->text );
+                                if( ( inv = xt_find_node( inv->children, "reason" ) ) && inv->text_len > 0 )
+                                        reason = inv->text;
                         }
                 }
@@ -104 +104 @@
                         imcb_buddy_msg( ic, from, fullmsg->str,
                                         0, jabber_get_timestamp( node ) );
+                if( room )
+                        imcb_chat_invite( ic, room, from, reason );
                 
                 g_string_free( fullmsg, TRUE );