diff options
| author | Sadie Powell <sadie@witchery.services> | 2023-07-11 12:28:51 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2023-07-11 12:28:54 +0100 |
| commit | aa619f1eebf23cffefc1d7a1b713a4340508a2d3 (patch) | |
| tree | a54009db81e4b56d0407d7d2e785176548b5a301 /modules/commands | |
| parent | b7458c5da1dc952a29c39fc7c72cbde44ace004f (diff) | |
| parent | e717ac0a89273b7eb50001b4374f3dda2934cd3a (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'modules/commands')
| -rw-r--r-- | modules/commands/bs_kick.cpp | 6 | ||||
| -rw-r--r-- | modules/commands/ns_register.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/os_sxline.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index 9a376d9d2..f3a3ef7cd 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -31,7 +31,7 @@ struct KickerDataImpl : KickerData void Check(ChannelInfo *ci) override { - if (amsgs || badwords || bolds || caps || colors || flood || italics || repeat || reverses || underlines) + if (amsgs || badwords || bolds || caps || colors || flood || italics || repeat || reverses || underlines || dontkickops || dontkickvoices) return; ci->Shrink<KickerData>("kickerdata"); @@ -67,6 +67,8 @@ struct KickerDataImpl : KickerData data.SetType("floodlines", Serialize::Data::DT_INT); data["floodlines"] << kd->floodlines; data.SetType("floodsecs", Serialize::Data::DT_INT); data["floodsecs"] << kd->floodsecs; data.SetType("repeattimes", Serialize::Data::DT_INT); data["repeattimes"] << kd->repeattimes; + data.SetType("dontkickops", Serialize::Data::DT_INT); data["dontkickops"] << kd->dontkickops; + data.SetType("dontkickvoices", Serialize::Data::DT_INT); data["dontkickvoices"] << kd->dontkickvoices; for (int16_t i = 0; i < TTB_SIZE; ++i) data["ttb"] << kd->ttb[i] << " "; } @@ -95,6 +97,8 @@ struct KickerDataImpl : KickerData data["floodlines"] >> kd->floodlines; data["floodsecs"] >> kd->floodsecs; data["repeattimes"] >> kd->repeattimes; + data["dontkickops"] >> kd->dontkickops; + data["dontkickvoices"] >> kd->dontkickvoices; Anope::string ttb, tok; data["ttb"] >> ttb; diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp index cae204eca..ab113b934 100644 --- a/modules/commands/ns_register.cpp +++ b/modules/commands/ns_register.cpp @@ -83,7 +83,7 @@ class CommandNSConfirm : public Command source.Reply(_("Invalid passcode.")); } else - source.Reply(_("Invalid passcode.")); + source.Reply(NICK_IDENTIFY_REQUIRED); return; } diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp index 87a952a31..b280297a8 100644 --- a/modules/commands/os_sxline.cpp +++ b/modules/commands/os_sxline.cpp @@ -676,7 +676,7 @@ class CommandOSSQLine : public CommandOSSXLineBase "regular expression, the expression will be matched against\n" "channels too.")); source.Reply(_(" \n" - "\002SQLINE ADD\002 adds the given (nick's) mask to the SQLINE\n" + "\002SQLINE ADD\002 adds the given (nick/channel) mask to the SQLINE\n" "list for the given reason (which \002must\002 be given).\n" "\037expiry\037 is specified as an integer followed by one of \037d\037\n" "(days), \037h\037 (hours), or \037m\037 (minutes). Combinations (such as\n" |