Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv8899/src
Modified Files:
opserv.c chanserv.c
Log Message:
replace a few usages of irc_mode() with ChangeChannelModes()
Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -r1.210 -r1.211
*** opserv.c 2001/09/18 02:13:09 1.210
--- opserv.c 2001/09/18 02:23:08 1.211
***************
*** 1140,1148 ****
OPSERV_MIN_PARMS(2, true);
unsplit_string(argv+1, argc-1);
! if (channel->key[0]) {
! char *mc = alloca(strlen(channel->key)+4);
! sprintf(mc, "-k %s", channel->key);
! irc_mode(opserv, channel, mc);
! }
mod_chanmode(channel, argv[1], NULL, 0);
irc_mode(opserv, channel, argv[1]);
--- 1140,1144 ----
OPSERV_MIN_PARMS(2, true);
unsplit_string(argv+1, argc-1);
! if (channel->key[0]) ChangeChannelModes(channel, opserv, "-k", channel->key);
mod_chanmode(channel, argv[1], NULL, 0);
irc_mode(opserv, channel, argv[1]);
***************
*** 1280,1285 ****
AddChannelVoice(count, users, channel, opserv, 1);
}
! irc_mode(opserv, channel, "+m");
! channel->modes |= MODE_MODERATED;
opserv_notice(user, OSMSG_CHANNEL_MODERATED, channel->name);
return 1;
--- 1276,1280 ----
AddChannelVoice(count, users, channel, opserv, 1);
}
! ChangeChannelModes(channel, opserv, "+m");
opserv_notice(user, OSMSG_CHANNEL_MODERATED, channel->name);
return 1;
***************
*** 1294,1299 ****
return 0;
}
! irc_mode(opserv, channel, "-m");
! channel->modes &= ~MODE_MODERATED;
opserv_notice(user, OSMSG_CHANNEL_UNMODERATED, channel->name);
return 1;
--- 1289,1293 ----
return 0;
}
! ChangeChannelModes(channel, opserv, "-m");
opserv_notice(user, OSMSG_CHANNEL_UNMODERATED, channel->name);
return 1;
***************
*** 1889,1894 ****
AddChannelUser(opserv, newchan, 0);
AddChannelOp(1, &opserv, newchan, NULL, 1);
! newchan->modes |= MODE_SECRET | MODE_INVITEONLY;
! irc_mode(NULL, newchan, "+sib *!*@*");
for (n=newchan->members.used; n>0; ) {
--- 1883,1887 ----
AddChannelUser(opserv, newchan, 0);
AddChannelOp(1, &opserv, newchan, NULL, 1);
! ChangeChannelModes(newchan, opserv, "+sib", "*!*@*");
for (n=newchan->members.used; n>0; ) {
***************
*** 1903,1908 ****
for (n=0; n<opserv_secret_words->used; n++) {
if (strcasestr(newchan->name, opserv_secret_words->list[n])) {
! newchan->modes |= MODE_SECRET;
! irc_mode(NULL, newchan, "+s");
}
}
--- 1896,1900 ----
for (n=0; n<opserv_secret_words->used; n++) {
if (strcasestr(newchan->name, opserv_secret_words->list[n])) {
! ChangeChannelModes(newchan, opserv, "+s");
}
}
Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -r1.183 -r1.184
*** chanserv.c 2001/09/18 02:13:09 1.183
--- chanserv.c 2001/09/18 02:23:08 1.184
***************
*** 1606,1611 ****
chanserv_join(new_chan);
parse_mode_lock(&CHANSERV_DEFAULT_MODES, 1, new_chan);
! mod_chanmode(channel, CHANSERV_DEFAULT_MODES, NULL, 0);
! irc_mode(chanserv, channel, CHANSERV_DEFAULT_MODES);
if(!add_channel_user(new_chan, handle, levelMap[USER_LEVEL_HIGHEST], USER_LEVEL_HIGHEST, now, NULL))
--- 1606,1610 ----
chanserv_join(new_chan);
parse_mode_lock(&CHANSERV_DEFAULT_MODES, 1, new_chan);
! ChangeChannelModes(channel, chanserv, CHANSERV_DEFAULT_MODES);
if(!add_channel_user(new_chan, handle, levelMap[USER_LEVEL_HIGHEST], USER_LEVEL_HIGHEST, now, NULL))
***************
*** 2540,2560 ****
static CHANSERV_FUNC(cmd_open)
{
- char *change;
-
cmd_unbanme(CSFUNC_ARGS);
if(channel->modes & MODE_KEY)
{
! change = alloca(strlen(channel->key) + 6);
! sprintf(change, "-ilk %s", channel->key);
}
else
{
! change = "-il";
}
- mod_chanmode(channel, change, NULL, 0);
- irc_mode(channel->channel_info->bot, channel, change);
-
chanserv_notice(user, CSMSG_CHANNEL_OPENED, channel->name);
return 1;
--- 2539,2553 ----
static CHANSERV_FUNC(cmd_open)
{
cmd_unbanme(CSFUNC_ARGS);
if(channel->modes & MODE_KEY)
{
! ChangeChannelModes(channel, channel->channel_info->bot, "-ilk", channel->key);
}
else
{
! ChangeChannelModes(channel, channel->channel_info->bot, "-il");
}
chanserv_notice(user, CSMSG_CHANNEL_OPENED, channel->name);
return 1;
***************
*** 2971,2975 ****
{
create_mode_lock(modes, channel->channel_info);
-
mod_chanmode(channel, modes, NULL, 0);
irc_mode(channel->channel_info->bot, channel, modes);
--- 2964,2967 ----
***************
*** 4415,4419 ****
struct chanNode *channel = data;
unsigned int limit;
- char change[10];
limit = channel->members.used + chanserv_conf.adjust_threshold + 5;
--- 4407,4410 ----
***************
*** 4428,4436 ****
return;
}
-
- sprintf(change, "+l %d", limit);
! channel->limit = limit;
! irc_mode(channel->channel_info->bot, channel, change);
}
--- 4419,4424 ----
return;
}
! ChangeChannelModes(channel, channel->channel_info->bot, "+l", limit);
}
|
