Changeset ea728e6

Timestamp:

2010-08-24T12:19:52Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b78c4b9

Parents:

9b1d2d6 (diff), bd599b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

Files:

• irc.h (modified) (1 diff)
• irc_im.c (modified) (2 diffs)
• irc_send.c (modified) (1 diff)
• protocols/bee.h (modified) (2 diffs)
• protocols/bee_chat.c (modified) (1 diff)
• protocols/jabber/message.c (modified) (3 diffs)
• protocols/jabber/si.c (modified) (2 diffs)
• protocols/twitter/twitter_lib.c (modified) (1 diff)
• protocols/yahoo/libyahoo2.c (modified) (2 diffs)
• utils/README (modified) (1 diff)
• utils/centericq2bitlbee.sh (deleted)
• utils/convert_gnomeicu.txt (deleted)
• utils/convert_purple.py (added)
• utils/create_nicksfile.pl (deleted)

irc.h

@@ -282 +282 @@
 void irc_send_channel_user_mode_diff( irc_channel_t *ic, irc_user_t *iu,
                                       irc_channel_user_flags_t old, irc_channel_user_flags_t new );
+void irc_send_invite( irc_user_t *iu, irc_channel_t *ic );
 
 /* irc_user.c */

irc_im.c

@@ -613 +613 @@
 }
 
+static gboolean bee_irc_chat_invite( bee_t *bee, bee_user_t *bu, const char *name, const char *msg )
+{
+        char *channel, *s;
+        irc_t *irc = bee->ui_data;
+        irc_user_t *iu = bu->ui_data;
+        irc_channel_t *chan;
+        
+        if( strchr( CTYPES, name[0] ) )
+                channel = g_strdup( name );
+        else
+                channel = g_strdup_printf( "#%s", name );
+        
+        if( ( s = strchr( channel, '@' ) ) )
+                *s = '\0';
+        
+        if( strlen( channel ) > MAX_NICK_LENGTH )
+        {
+                /* If the channel name is very long (like those insane GTalk
+                   UUID names), try if we can use the inviter's nick. */
+                s = g_strdup_printf( "#%s", iu->nick );
+                if( irc_channel_by_name( irc, s ) == NULL )
+                {
+                        g_free( channel );
+                        channel = s;
+                }
+        }
+        
+        if( ( chan = irc_channel_new( irc, channel ) ) &&
+            set_setstr( &chan->set, "type", "chat" ) &&
+            set_setstr( &chan->set, "chat_type", "room" ) &&
+            set_setstr( &chan->set, "account", bu->ic->acc->tag ) &&
+            set_setstr( &chan->set, "room", (char*) name ) )
+        {
+                /* I'm assuming that if the user didn't "chat add" the room
+                   himself but got invited, it's temporary, so make this a
+                   temporary mapping that is removed as soon as we /PART. */
+                chan->flags |= IRC_CHANNEL_TEMP;
+        }
+        else
+        {
+                irc_channel_free( chan );
+                chan = NULL;
+        }
+        g_free( channel );
+        
+        irc_send_msg_f( iu, "PRIVMSG", irc->user->nick, "<< \002BitlBee\002 - Invitation to chatroom %s >>", name );
+        if( msg )
+                irc_send_msg( iu, "PRIVMSG", irc->user->nick, msg, NULL );
+        if( chan )
+        {
+                irc_send_msg_f( iu, "PRIVMSG", irc->user->nick, "To join the room, just /join %s", chan->name );
+                irc_send_invite( iu, chan );
+        }
+        
+        return TRUE;
+}
+
 /* IRC->IM */
 static gboolean bee_irc_channel_chat_privmsg_cb( gpointer data, gint fd, b_input_condition cond );
@@ -909 +966 @@
         bee_irc_chat_topic,
         bee_irc_chat_name_hint,
+        bee_irc_chat_invite,
         
         bee_irc_ft_in_start,

irc_send.c

@@ -398 +398 @@
                 irc_write( ic->irc, ":%s MODE %s %s", from, ic->name, changes );
 }
+
+void irc_send_invite( irc_user_t *iu, irc_channel_t *ic )
+{
+        irc_t *irc = iu->irc;
+        
+        irc_write( iu->irc, ":%s!%s@%s INVITE %s :%s",
+                   iu->nick, iu->user, iu->host, irc->user->nick, ic->name );
+}

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 );
@@ -176 +177 @@
 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 );

protocols/jabber/si.c

@@ -262 +262 @@
                                 break;
                         }
+                        else
+                        {
+                                c = c->next;
+                        }
 
                 if ( !requestok )
@@ -373 +377 @@
 {
         struct xt_node *c, *d;
-        char *ini_jid, *tgt_jid, *iq_id, *cmp;
+        char *ini_jid = NULL, *tgt_jid, *iq_id, *cmp;
         GSList *tflist;
         struct jabber_transfer *tf=NULL;

protocols/twitter/twitter_lib.c

@@ -373 +373 @@
 static xt_status twitter_xt_get_status( struct xt_node *node, struct twitter_xml_status *txs )
 {
-        struct xt_node *child, *rt;
+        struct xt_node *child, *rt = NULL;
         gboolean truncated = FALSE;
 

protocols/yahoo/libyahoo2.c

@@ -2169 +2169 @@
         yd->buddies = y_list_append(yd->buddies, bud);
 
+#if 0
+        /* BitlBee: This seems to be wrong in my experience. I think:
+           status = 0: Success
+           status = 2: Already on list
+           status = 3: Doesn't exist
+           status = 42: Invalid handle (possibly banned/reserved, I get it for
+                        handles like joe or jjjjjj)
+           Haven't seen others yet. But whenever the add is successful, there
+           will be a separate "went online" packet when the auth. request is
+           accepted. Couldn't find any test account that doesn't require auth.
+           unfortunately (if there is even such a thing?) */
+           
         /* A non-zero status (i've seen 2) seems to mean the buddy is already 
          * added and is online */
@@ -2176 +2188 @@
                 YAHOO_CALLBACK(ext_yahoo_status_changed) (yd->client_id, who,
                         YAHOO_STATUS_AVAILABLE, NULL, 0, 0, 0);
+        }
+#endif
+        /* BitlBee: Need ACK of added buddy, if it was successful. */
+        if (status == 0) {
+                YList *tmp = y_list_append(NULL, bud);
+                YAHOO_CALLBACK(ext_yahoo_got_buddies) (yd->client_id, tmp);
+                y_list_free(tmp);
         }
 }

utils/README

@@ -18 +18 @@
 
 
-* create_nicksfile.pl (Christian Friedl <christian.friedl@chello.at>)
+* convert_purple.py
 
-This program reads your ~/.licq/ configuration data and convert it to a
-correct .nicks file. This program can be extended to read other contact
-list file formats as well.
-
-
-* centericq2bitlbee.sh (geno <geno@xenyon.com>)
-
-Converter script for CenterICQ ICQ contact lists. See the documentation
-for more information.
-
-
-* convert_gnomeicu.txt
-
-Not a program, but this one contains a regex which should correctly
-convert GnomeICU configuration files into the BitlBee format.
-
-
-* Dynamic MOTD for BitlBee (Geert Hauwaerts <geert@hauwaerts.be>)
-
-Originally, I wanted to put this program here, but Geert put it online
-on his own server, with docs and stuff, so I guess it's better to put
-a link here. dmotd is a little script which generates a motd with some
-nice statistics, especially nice for servers with many people on it.
-
-See http://dmotd.hauwaerts.be/ for more information.
+Converts libpurple configs into something BitlBee can use, so you don't
+have to re-add all your accounts by hand.