Changeset 4469e7e

Timestamp:

2010-06-03T22:17:11Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2b8473c

Parents:

7b71feb

Message:

Support for the /topic command.

Files:

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

irc_commands.c

@@ -529 +529 @@
 }
 
-#if 0
 static void irc_cmd_topic( irc_t *irc, char **cmd )
 {
-        char *channel = cmd[1];
-        char *topic = cmd[2];
-        
-        if( topic )
-        {
-                /* Send the topic */
-                struct groupchat *c = irc_chat_by_channel( irc, channel );
-                if( c && c->ic && c->ic->acc->prpl->chat_topic )
-                        c->ic->acc->prpl->chat_topic( c, topic );
-        }
-        else
-        {
-                /* Get the topic */
-                irc_topic( irc, channel );
-        }
-}
-#endif
+        irc_channel_t *ic = irc_channel_by_name( irc, cmd[1] );
+        const char *new = cmd[2];
+        
+        if( ic == NULL )
+        {
+                irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
+        }
+        else if( new )
+        {
+                if( ic->f->topic == NULL )
+                        irc_send_num( irc, 482, "%s :Can't change this channel's topic", ic->name );
+                else if( ic->f->topic( ic, new ) )
+                        irc_send_topic( ic, TRUE );
+        }
+        else
+        {
+                irc_send_topic( ic, FALSE );
+        }
+}
 
 static void irc_cmd_away( irc_t *irc, char **cmd )
@@ -637 +638 @@
 #if 0
         { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
+#endif
         { "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },
-#endif
         { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },

irc_im.c

@@ -477 +477 @@
 static gboolean bee_irc_channel_chat_topic( irc_channel_t *ic, const char *new )
 {
-        return TRUE;
+        struct groupchat *c = ic->data;
+        char *topic = g_strdup( new ); /* TODO: Need more const goodness here, sigh */
+        
+        if( c->ic->acc->prpl->chat_topic == NULL )
+                irc_send_num( ic->irc, 482, "%s :IM network does not support channel topics", ic->name );
+        else
+        {
+                c->ic->acc->prpl->chat_topic( c, topic );
+                return TRUE;
+        }
+                
+        return FALSE;
 }