Changeset 66b9e36a

Timestamp:

2010-05-08T21:52:25Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

eb37735

Parents:

e685657

Message:

Restored /invite for groupchats.

Files:

• irc.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• irc_im.c (modified) (2 diffs)

irc.h

@@ -158 +158 @@
         gboolean (*part)( irc_channel_t *ic, const char *msg );
         gboolean (*topic)( irc_channel_t *ic, const char *new );
+        gboolean (*invite)( irc_channel_t *ic, irc_user_t *iu );
 };
 

irc_commands.c

@@ -370 +370 @@
 }
 
-#if 0
 static void irc_cmd_invite( irc_t *irc, char **cmd )
 {
-        char *nick = cmd[1], *channel = cmd[2];
-        struct groupchat *c = irc_chat_by_channel( irc, channel );
-        user_t *u = user_find( irc, nick );
-        
-        if( u && c && ( u->ic == c->ic ) )
-                if( c->ic && c->ic->acc->prpl->chat_invite )
-                {
-                        c->ic->acc->prpl->chat_invite( c, u->handle, NULL );
-                        irc_send_num( irc, 341, "%s %s", nick, channel );
-                        return;
-                }
-        
-        irc_send_num( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel );
-}
-#endif
+        irc_channel_t *ic;
+        irc_user_t *iu;
+        
+        if( ( iu = irc_user_by_name( irc, cmd[1] ) ) == NULL )
+        {
+                irc_send_num( irc, 401, "%s :No such nick", cmd[1] );
+                return;
+        }
+        else if( ( ic = irc_channel_by_name( irc, cmd[2] ) ) == NULL )
+        {
+                irc_send_num( irc, 403, "%s :No such channel", cmd[2] );
+                return;
+        }
+        
+        if( ic->f->invite )
+                ic->f->invite( ic, iu );
+        else
+                irc_send_num( irc, 482, "%s :Can't invite people here", cmd[2] );
+}
 
 static void irc_cmd_userhost( irc_t *irc, char **cmd )
@@ -618 +621 @@
         { "ison",        1, irc_cmd_ison,        IRC_CMD_LOGGED_IN },
         { "watch",       1, irc_cmd_watch,       IRC_CMD_LOGGED_IN },
+        { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
 #if 0
-        { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
         { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
         { "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },

irc_im.c

@@ -413 +413 @@
 }
 
+static gboolean bee_irc_channel_chat_invite( irc_channel_t *ic, irc_user_t *iu )
+{
+        struct groupchat *c = ic->data;
+        
+        if( iu->bu->ic != c->ic )
+                irc_send_num( ic->irc, 482, "%s :Can't mix different IM networks in one groupchat", ic->name );
+        else if( c->ic->acc->prpl->chat_invite )
+                c->ic->acc->prpl->chat_invite( c, iu->bu->handle, NULL );
+        else
+                irc_send_num( ic->irc, 482, "%s :IM protocol does not support room invitations", ic->name );
+        
+        return TRUE;
+}
+
 static const struct irc_channel_funcs irc_channel_im_chat_funcs = {
         bee_irc_channel_chat_privmsg,
@@ -418 +432 @@
         bee_irc_channel_chat_part,
         bee_irc_channel_chat_topic,
+        bee_irc_channel_chat_invite,
 };