Changes in irc_commands.c [50e1776:6bbb939]

File:

• irc_commands.c (modified) (4 diffs)

irc_commands.c

@@ -144 +144 @@
                 irc_join( irc, u, irc->channel );
         }
-        else if( ( c = irc_chat_by_channel( irc, cmd[1] ) ) )
+        else if( ( c = chat_by_channel( cmd[1] ) ) )
         {
                 user_t *u = user_find( irc, irc->nick );
@@ -201 +201 @@
 {
         char *nick = cmd[1], *channel = cmd[2];
-        struct groupchat *c = irc_chat_by_channel( irc, channel );
+        struct groupchat *c = chat_by_channel( channel );
         user_t *u = user_find( irc, nick );
         
@@ -287 +287 @@
                         u = u->next;
                 }
-        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
+        else if( ( c = chat_by_channel( channel ) ) )
                 for( l = c->in_room; l; l = l->next )
                 {
@@ -421 +421 @@
 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 );
-        }
+        if( cmd[2] )
+                irc_reply( irc, 482, "%s :Cannot change topic", cmd[1] );
+        else
+                irc_topic( irc, cmd[1] );
 }