From 0dd2f4c5a0c284b8266f4f3acd623c5200d4e349 Mon Sep 17 00:00:00 2001 From: Entrope Date: Mon, 1 Mar 2004 02:44:25 +0000 Subject: [PATCH] Minor fixes and improvements * Fix implementation of privileged-setter note types (it ignored the OpServ access level before). * Show proper message when an account's announcements are disabled. * Translate OSMSG_FLOOD_MODERATE when sending it to a channel. git-archimport-id: srvx@srvx.net--2004-srvx/srvx--devo--1.3--patch-17 --- src/chanserv.c | 2 +- src/nickserv.c | 2 +- src/opserv.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chanserv.c b/src/chanserv.c index 97776c7..36871b4 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -4162,7 +4162,7 @@ note_type_settable_by_user(struct chanNode *channel, struct note_type *ntype, st case NOTE_SET_CHANNEL_SETTER: return check_user_level(channel, user, lvlSetters, 1, 0); case NOTE_SET_PRIVILEGED: default: - return IsHelping(user); + return IsHelping(user) && (user->handle_info->opserv_level >= ntype->set_access.min_opserv); } } diff --git a/src/nickserv.c b/src/nickserv.c index a91d8a4..5a61bfd 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -2193,7 +2193,7 @@ static OPTION_FUNC(opt_announcements) switch (hi->announcements) { case 'y': choice = user_find_message(user, "MSG_ON"); break; - case 'n': choice = user_find_message(user, "MSG_ON"); break; + case 'n': choice = user_find_message(user, "MSG_OFF"); break; case '?': choice = "default"; break; default: choice = "unknown"; break; } diff --git a/src/opserv.c b/src/opserv.c index e1467fa..ba6d7e7 100644 --- a/src/opserv.c +++ b/src/opserv.c @@ -1875,7 +1875,7 @@ opserv_join_check(struct modeNode *mNode) change.modes_set |= MODE_MODERATED; if (change.modes_set || change.argc) mod_chanmode_announce(opserv, channel, &change); - send_channel_notice(channel, opserv, "OSMSG_FLOOD_MODERATE"); + send_target_message(0, channel->name, opserv, "OSMSG_FLOOD_MODERATE"); opserv_alert("Warning: Possible join flood in %s (currently %d users; channel moderated).", channel->name, channel->members.used); } else { opserv_alert("Warning: Possible join flood in %s (currently %d users).", channel->name, channel->members.used); -- 2.20.1