Changeset 7821ee8

Timestamp:

2015-01-29T19:24:17Z (9 years ago)

Author:

jgeboski <jgeboski@…>

Branches:

master

Children:

e41cc40

Parents:

7b8238d

git-author:

jgeboski <jgeboski@…> (28-01-15 23:40:47)

git-committer:

jgeboski <jgeboski@…> (29-01-15 19:24:17)

Message:

irc_commands: implemented KICK support

With similar commands being supported, such as INVITE, the KICK command
should be supported as well. The key motivation behind supporting KICK
is having for having a way to remove users from group chats. As of now,
there is no way for a bitlbee user to remove a user from a group chat.
With no current KICK implementation, it made using this command a prime
candidate for the UI side of this implementation. In addition, the KICK
command has been supported in the control channel as well. This is to
keep the INVITE/KICK pair consistent.

Files:

• irc.h (modified) (1 diff)
• irc_channel.c (modified) (2 diffs)
• irc_commands.c (modified) (2 diffs)
• irc_im.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (1 diff)

irc.h

@@ -188 +188 @@
         gboolean (*topic)( irc_channel_t *ic, const char *new_topic );
         gboolean (*invite)( irc_channel_t *ic, irc_user_t *iu );
+        void (*kick)( irc_channel_t *ic, irc_user_t *iu, const char *msg );
         
         gboolean (*_init)( irc_channel_t *ic );

irc_channel.c

@@ -626 +626 @@
 }
 
+static void control_channel_kick( irc_channel_t *ic, irc_user_t *iu, const char *msg )
+{
+        struct irc_control_channel *icc = ic->data;
+        bee_user_t *bu = iu->bu;
+        
+        if( bu == NULL )
+                return;
+        
+        if( icc->type != IRC_CC_TYPE_GROUP )
+        {
+                irc_send_num( ic->irc, 482, "%s :Kicks are only possible to fill_by=group channels", ic->name );
+                return;
+        }
+        
+        bu->ic->acc->prpl->remove_buddy( bu->ic, bu->handle,
+                                         icc->group ? icc->group->name : NULL );
+}
+
 static char *set_eval_by_account( set_t *set, char *value );
 static char *set_eval_fill_by( set_t *set, char *value );
@@ -844 +862 @@
         NULL,
         control_channel_invite,
+        control_channel_kick,
         
         control_channel_init,

irc_commands.c

@@ -498 +498 @@
         else if( ic->f->invite( ic, iu ) )
                 irc_send_num( irc, 341, "%s %s", iu->nick, ic->name );
+}
+
+static void irc_cmd_kick( irc_t *irc, char **cmd )
+{
+        irc_channel_t *ic;
+        irc_user_t *iu;
+        
+        if( ( iu = irc_user_by_name( irc, cmd[2] ) ) == NULL )
+        {
+                irc_send_num( irc, 401, "%s :No such nick", cmd[2] );
+                return;
+        }
+        else if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
+        {
+                irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
+                return;
+        }
+        else if( !ic->f->kick )
+        {
+                irc_send_num( irc, 482, "%s :Can't kick people here", cmd[1] );
+                return;
+        }
+        
+        ic->f->kick( ic, iu, cmd[3] ? cmd[3] : NULL );
 }
 
@@ -746 +770 @@
         { "watch",       1, irc_cmd_watch,       IRC_CMD_LOGGED_IN },
         { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
+        { "kick",        2, irc_cmd_kick,        IRC_CMD_LOGGED_IN },
         { "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },
         { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },

irc_im.c

@@ -972 +972 @@
 }
 
+static void bee_irc_channel_chat_kick( irc_channel_t *ic, irc_user_t *iu, const char *msg )
+{
+        struct groupchat *c = ic->data;
+        bee_user_t *bu = iu->bu;
+        
+        if( ( c == NULL ) || ( bu == NULL ) )
+                return;
+        
+        if( !c->ic->acc->prpl->chat_kick )
+        {
+                irc_send_num( ic->irc, 482, "%s :IM protocol does not support room kicking", ic->name );
+                return;
+        }
+        
+        c->ic->acc->prpl->chat_kick( c, iu->bu->handle, msg );
+}
+
 static char *set_eval_room_account( set_t *set, char *value );
 static char *set_eval_chat_type( set_t *set, char *value );
@@ -1056 +1073 @@
         bee_irc_channel_chat_topic,
         bee_irc_channel_chat_invite,
+        bee_irc_channel_chat_kick,
 
         bee_irc_channel_init,

protocols/nogaim.h

@@ -213 +213 @@
          */
         void (* chat_invite)    (struct groupchat *, char *who, char *message);
+        /* This is called when the user uses the /kick IRC command.
+         * - 'who' is a handle to kick
+         * - 'message' is a kick message or NULL
+         */
+        void (* chat_kick)      (struct groupchat *, char *who, const char *message);
         /* This is called when the user uses the /part IRC command in a group
          * chat. You just should tell the user about it, nothing more. */