Merge pull request #288 from edk0/umode-o-split

[solanum.git] / extensions / force_user_invis.c

diff --git a/extensions/force_user_invis.c b/extensions/force_user_invis.c
index fe6bbb4d1b64fb3b969461100a0310a9435ae879..8a94d33d943a23f489fa64468334b13bf645c34d 100644 (file)
--- a/extensions/force_user_invis.c
+++ b/extensions/force_user_invis.c
@@ -3,6 +3,7 @@
  *
  * Based off no_oper_invis.c by jilles
  *
+ * Note that +i must be included in default_umodes
  */
 
 #include "stdinc.h"
@@ -14,6 +15,9 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 
+static const char noi_desc[] =
+       "Do not allow users to remove user mode +i unless they are operators";
+
 static void h_noi_umode_changed(hook_data_umode_changed *);
 
 mapi_hfn_list_av1 noi_hfnlist[] = {
@@ -21,14 +25,14 @@ mapi_hfn_list_av1 noi_hfnlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(force_user_invis, NULL, NULL, NULL, NULL, noi_hfnlist, "1.0.0");
+DECLARE_MODULE_AV2(force_user_invis, NULL, NULL, NULL, NULL, noi_hfnlist, NULL, NULL, noi_desc);
 
 static void
 h_noi_umode_changed(hook_data_umode_changed *hdata)
 {
        struct Client *source_p = hdata->client;
 
-       if (MyClient(source_p) && !IsOper(source_p) && !IsInvisible(source_p)) {
+       if (MyClient(source_p) && !IsOperGeneral(source_p) && !IsInvisible(source_p)) {
                SetInvisible(source_p);
        }
 }