Changeset eb37735

Timestamp:

2010-05-08T23:54:37Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

36577aa

Parents:

66b9e36a

Message:

This is how you now start groupchats: /join #channel, /invite people.

Files:

• irc.h (modified) (1 diff)
• irc_channel.c (modified) (4 diffs)
• irc_im.c (modified) (1 diff)

irc.h

@@ -131 +131 @@
 {
         IRC_CHANNEL_JOINED = 1,
-        IRC_CHANNEL_CONTACTS = 256,
+        
+        /* Hack: Set this flag right before jumping into IM when we expect
+           a call to imcb_chat_new(). */
+        IRC_CHANNEL_CHAT_PICKME = 0x10000,
 } irc_channel_flags_t;
 

irc_channel.c

@@ -28 +28 @@
 static gint irc_channel_user_cmp( gconstpointer a_, gconstpointer b_ );
 static const struct irc_channel_funcs control_channel_funcs;
+static const struct irc_channel_funcs groupchat_stub_funcs;
 
 irc_channel_t *irc_channel_new( irc_t *irc, const char *name )
@@ -37 +38 @@
         
         ic = g_new0( irc_channel_t, 1 );
-        ic->f = &control_channel_funcs;
         ic->irc = irc;
         ic->name = g_strdup( name );
@@ -48 +48 @@
         
         irc->channels = g_slist_prepend( irc->channels, ic );
+        
+        if( name[0] == '&' )
+                ic->f = &control_channel_funcs;
+        else /* if( name[0] == '#' ) */
+                ic->f = &groupchat_stub_funcs;
         
         return ic;
@@ -251 +256 @@
         control_channel_privmsg,
 };
+
+/* Groupchat stub: Only handles /INVITE at least for now. */
+static gboolean groupchat_stub_invite( irc_channel_t *ic, irc_user_t *iu )
+{
+        bee_user_t *bu = iu->bu;
+        
+        if( iu->bu->ic->acc->prpl->chat_with )
+        {
+                ic->flags |= IRC_CHANNEL_CHAT_PICKME;
+                iu->bu->ic->acc->prpl->chat_with( bu->ic, bu->handle );
+                ic->flags &= ~IRC_CHANNEL_CHAT_PICKME;
+                return TRUE;
+        }
+        else
+        {
+                irc_send_num( ic->irc, 482, "%s :IM protocol does not support room invitations", ic->name );
+                return FALSE;
+        }
+}
+
+static const struct irc_channel_funcs groupchat_stub_funcs = {
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        groupchat_stub_invite,
+};

irc_im.c

@@ -259 +259 @@
         irc_channel_t *ic;
         char *topic;
+        GSList *l;
         int i;
         
-        for( i = 0; i <= 999; i ++ )
+        /* Try to find a channel that expects to receive a groupchat.
+           This flag is set by groupchat_stub_invite(). */
+        for( l = irc->channels; l; l = l->next )
+        {
+                ic = l->data;
+                if( ic->flags & IRC_CHANNEL_CHAT_PICKME )
+                        break;
+        }
+        
+        /* If we found none, just generate some stupid name. */
+        if( l == NULL ) for( i = 0; i <= 999; i ++ )
         {
                 char name[16];