Changeset f5c0d8e for irc_im.c

Timestamp:

2010-08-31T20:06:14Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0c85c08

Parents:

8358691 (diff), 31dbb90a (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:

Merge mainline stuff.

File:

• irc_im.c (modified) (4 diffs)

irc_im.c

@@ -252 +252 @@
 {
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        irc_t *irc = (irc_t *) bee->ui_data;
         char *s;
         
@@ -266 +265 @@
         if( ( bu->ic->flags & OPT_LOGGED_IN ) && set_getbool( &bee->set, "display_namechanges" ) )
         {
+                /* People don't like this /NOTICE. Meh, let's go back to the old one.
                 char *msg = g_strdup_printf( "<< \002BitlBee\002 - Changed name to `%s' >>", iu->fullname );
                 irc_send_msg( iu, "NOTICE", irc->user->nick, msg, NULL );
+                */
+                imcb_log( bu->ic, "User `%s' changed name to `%s'", iu->nick, iu->fullname );
         }
         
@@ -613 +615 @@
 }
 
+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 +968 @@
         bee_irc_chat_topic,
         bee_irc_chat_name_hint,
+        bee_irc_chat_invite,
         
         bee_irc_ft_in_start,