From 324c378cd2d3f208b000e1279d462665d163edb7 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 14 Jul 2010 00:14:41 +0100 Subject: Move control channel autoconfiguration to irc_cmd_join() instead so that it only triggers on channels created by the user. (And not at identify time, which was causing odd problems on my test setup.) --- irc_commands.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'irc_commands.c') diff --git a/irc_commands.c b/irc_commands.c index d11d46d3..0bf20cfc 100644 --- a/irc_commands.c +++ b/irc_commands.c @@ -140,7 +140,31 @@ static void irc_cmd_join( irc_t *irc, char **cmd ) *comma = '\0'; if( ( ic = irc_channel_by_name( irc, s ) ) == NULL ) + { ic = irc_channel_new( irc, s ); + + if( strcmp( set_getstr( &ic->set, "type" ), "control" ) != 0 ) + { + /* Autoconfiguration is for control channels only ATM. */ + } + else if( bee_group_by_name( ic->irc->b, ic->name + 1, FALSE ) ) + { + set_setstr( &ic->set, "group", ic->name + 1 ); + set_setstr( &ic->set, "fill_by", "group" ); + } + else if( set_setstr( &ic->set, "protocol", ic->name + 1 ) ) + { + set_setstr( &ic->set, "fill_by", "protocol" ); + } + else if( set_setstr( &ic->set, "account", ic->name + 1 ) ) + { + set_setstr( &ic->set, "fill_by", "account" ); + } + else + { + bee_irc_channel_update( ic->irc, ic, NULL ); + } + } if( ic == NULL ) { -- cgit v1.2.3