spamserv_part_channel(channel, reason);
if(move)
- snprintf(reason, sizeof(reason), "$X (channel %s) moved to %s by %s.", channel->name, target->name, user->handle_info->handle);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS,
+ "SSMSG_CHANNEL_MOVED", channel->name, target->name,
+ user->handle_info->handle);
else
- snprintf(reason, sizeof(reason), "$X (channel %s) merged into %s by %s.", channel->name, target->name, user->handle_info->handle);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS,
+ "SSMSG_CHANNEL_MERGED", channel->name, target->name,
+ user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
return 1;
}
if(cInfo)
{
- char global[MAXLEN], partmsg[MAXLEN];
+ char partmsg[MAXLEN];
switch (type)
{
case manually:
- snprintf(global, sizeof(global), "$X (channel %s) %s by %s.", channel->name, reason, user->handle_info->handle);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "SSMSG_UNREG_MANUAL",
+ channel->name, reason, user->handle_info->handle);
snprintf(partmsg, sizeof(partmsg), "%s %s by %s.", channel->name, reason, user->handle_info->handle);
break;
case expire:
- snprintf(global, sizeof(global), "$X (channel %s) registration expired.", channel->name);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "SSMSG_REG_EXPIRED",
+ channel->name);
snprintf(partmsg, sizeof(partmsg), "%s registration expired.", channel->name);
break;
case lost_all_users:
- snprintf(global, sizeof(global), "$X (channel %s) lost all users.", channel->name);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "SSMSG_LOST_ALL_USERS",
+ channel->name);
snprintf(partmsg, sizeof(partmsg), "%s lost all users.", channel->name);
break;
}
spamserv_part_channel(channel, partmsg);
spamserv_unregister_channel(cInfo);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, global);
}
}
SPAMSERV_FUNC(cmd_register)
{
struct chanInfo *cInfo;
- char reason[MAXLEN];
if(!channel || !channel->channel_info)
{
spamserv_join_channel(cInfo->channel);
- snprintf(reason, sizeof(reason), "%s (channel %s) registered by %s.", spamserv->nick, channel->name, user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "SSMSG_REGISTERED_BY",
+ channel->name, user->handle_info->handle);
ss_reply("SSMSG_REG_SUCCESS", channel->name);
return 1;
spamserv_unregister_channel(cInfo);
- snprintf(reason, sizeof(reason), "%s (channel %s) unregistered by %s.", spamserv->nick, channel->name, user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "SSMSG_UNREGISTERED_BY",
+ channel->name, user->handle_info->handle);
ss_reply("SSMSG_UNREG_SUCCESS", channel->name);
return 1;
void
spamserv_channel_message(struct chanNode *channel, struct userNode *user, char *text)
{
+ struct chanData *cData;
struct chanInfo *cInfo;
struct userInfo *uInfo;
+ struct userData *uData;
struct spamNode *sNode;
struct floodNode *fNode;
unsigned int violation = 0;
char reason[MAXLEN];
/* make sure: spamserv is not disabled; x3 is running; spamserv is in the chan; chan is regged, user does exist */
- if(!spamserv || quit_services || !GetUserMode(channel, spamserv) || !(cInfo = get_chanInfo(channel->name)) || !(uInfo = get_userInfo(user->nick)))
+ if(!spamserv || quit_services || !GetUserMode(channel, spamserv) || IsOper(user) || !(cInfo = get_chanInfo(channel->name)) || !(uInfo = get_userInfo(user->nick)))
return;
+ cData = channel->channel_info;
+ uData = GetChannelUser(cData, user->handle_info);
+
if(!CHECK_CHANOPS(cInfo))
{
struct modeNode *mn = GetUserMode(channel, user);
- if(mn->modes & MODE_CHANOP)
+ if (mn && (mn->modes & MODE_CHANOP))
+ return;
+
+ /* Chan Ops covers all levels except peon and half op */
+ if(uData && ((uData->access < UL_OP) || (uData->access < UL_MANAGER) ||
+ (uData->access < UL_COOWNER) || (uData->access < UL_OWNER)))
return;
}
if(!CHECK_HALFOPS(cInfo))
{
struct modeNode *mn = GetUserMode(channel, user);
- if(mn->modes & MODE_HALFOP)
+ if (mn && (mn->modes & MODE_HALFOP))
+ return;
+
+ if(uData && (uData->access < UL_HALFOP))
return;
}
if(!CHECK_VOICED(cInfo))
{
struct modeNode *mn = GetUserMode(channel, user);
- if((mn->modes & MODE_VOICE) && !(mn->modes & MODE_CHANOP) && !(mn->modes & MODE_HALFOP))
+ if (mn && ((mn->modes & MODE_VOICE) && !(mn->modes & MODE_CHANOP) && !(mn->modes & MODE_HALFOP)))
+ return;
+
+ if(uData && (uData->access < UL_PEON))
return;
}