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

diff --git a/src/chanserv.c b/src/chanserv.c
index 97776c713a57aac14ceaf117fd9c7ae7758ac217..36871b4450c3670d449521599f4cc7df46892c3c 100644 (file)
--- 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 a91d8a4a61d625484227b163b08c9bf5a208766c..5a61bfdb76e089f23c9ec795de160a9b574f01c9 100644 (file)
--- 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 e1467fa3dd28d5b57a6c4a75faeb3679f2bc3728..ba6d7e7b21a0804578829127b7093f703a557c93 100644 (file)
--- 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);