Changeset 2288705 for irc_commands.c
- Timestamp:
- 2009-12-07T21:54:19Z (14 years ago)
- Branches:
- master
- Children:
- 1c3008a
- Parents:
- aac4017 (diff), 36cf9fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
irc_commands.c
raac4017 r2288705 27 27 #include "bitlbee.h" 28 28 #include "ipc.h" 29 #include "chat.h" 29 30 30 31 static void irc_cmd_pass( irc_t *irc, char **cmd ) … … 125 126 static void irc_cmd_mode( irc_t *irc, char **cmd ) 126 127 { 127 if( *cmd[1] == '#' || *cmd[1] == '&')128 if( strchr( CTYPES, *cmd[1] ) ) 128 129 { 129 130 if( cmd[2] ) … … 193 194 else if( cmd[1] ) 194 195 { 195 if( ( cmd[1][0] == '#' || cmd[1][0] == '&' ) && cmd[1][1] ) 196 { 197 user_t *u = user_find( irc, cmd[1] + 1 ); 198 199 if( u && u->ic && u->ic->acc->prpl->chat_with ) 200 { 201 irc_reply( irc, 403, "%s :Initializing groupchat in a different channel", cmd[1] ); 202 203 if( !u->ic->acc->prpl->chat_with( u->ic, u->handle ) ) 204 { 205 irc_usermsg( irc, "Could not open a groupchat with %s.", u->nick ); 206 } 207 } 208 else if( u ) 209 { 210 irc_reply( irc, 403, "%s :Groupchats are not possible with %s", cmd[1], cmd[1]+1 ); 211 } 212 else 213 { 214 irc_reply( irc, 403, "%s :No such nick", cmd[1] ); 215 } 216 } 196 struct chat *c; 197 198 if( strchr( CTYPES, cmd[1][0] ) == NULL || cmd[1][1] == 0 ) 199 irc_reply( irc, 479, "%s :Invalid channel name", cmd[1] ); 200 else if( ( c = chat_bychannel( irc, cmd[1] ) ) && c->acc && c->acc->ic ) 201 chat_join( irc, c, cmd[2] ); 217 202 else 218 {219 203 irc_reply( irc, 403, "%s :No such channel", cmd[1] ); 220 }221 204 } 222 205 } … … 433 416 if( g_hash_table_lookup_extended( irc->watches, nick, &okey, &ovalue ) ) 434 417 { 418 g_hash_table_remove( irc->watches, okey ); 435 419 g_free( okey ); 436 g_hash_table_remove( irc->watches, okey );437 420 438 421 irc_reply( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" );
Note: See TracChangeset
for help on using the changeset viewer.