diff options
| -rw-r--r-- | include/listmode.h | 7 | ||||
| -rw-r--r-- | src/coremods/core_channel/core_channel.h | 2 | ||||
| -rw-r--r-- | src/listmode.cpp | 7 | ||||
| -rw-r--r-- | src/modules/m_autoop.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_banexception.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_chanfilter.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_exemptchanops.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_inviteexception.cpp | 2 |
8 files changed, 10 insertions, 16 deletions
diff --git a/include/listmode.h b/include/listmode.h index 57981956c..21ea9f5ec 100644 --- a/include/listmode.h +++ b/include/listmode.h @@ -94,10 +94,6 @@ protected: */ unsigned int endoflistnumeric; - /** String to send for end of list - */ - std::string endofliststring; - /** Automatically tidy up entries */ bool tidy; @@ -116,12 +112,11 @@ public: * @param Creator The creator of this class * @param Name Mode name * @param modechar Mode character - * @param eolstr End of list string * @param lnum List numeric * @param eolnum End of list numeric * @param autotidy Automatically tidy list entries on add */ - ListModeBase(Module* Creator, const std::string& Name, char modechar, const std::string& eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy); + ListModeBase(Module* Creator, const std::string& Name, char modechar, unsigned int lnum, unsigned int eolnum, bool autotidy); /** Determines whether some channels have longer lists than others. */ bool HasVariableLength() const { return chanlimits.size() > 1; } diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h index d1afa8adc..6750893c4 100644 --- a/src/coremods/core_channel/core_channel.h +++ b/src/coremods/core_channel/core_channel.h @@ -132,7 +132,7 @@ class ModeChannelBan final { public: ModeChannelBan(Module* Creator) - : ListModeBase(Creator, "ban", 'b', "End of channel ban list", RPL_BANLIST, RPL_ENDOFBANLIST, true) + : ListModeBase(Creator, "ban", 'b', RPL_BANLIST, RPL_ENDOFBANLIST, true) { syntax = "<mask>"; } diff --git a/src/listmode.cpp b/src/listmode.cpp index c1936d246..9e1b45f4a 100644 --- a/src/listmode.cpp +++ b/src/listmode.cpp @@ -22,11 +22,10 @@ #include "inspircd.h" #include "listmode.h" -ListModeBase::ListModeBase(Module* Creator, const std::string& Name, char modechar, const std::string& eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy) +ListModeBase::ListModeBase(Module* Creator, const std::string& Name, char modechar, unsigned int lnum, unsigned int eolnum, bool autotidy) : ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_LIST) , listnumeric(lnum) , endoflistnumeric(eolnum) - , endofliststring(eolstr) , tidy(autotidy) , extItem(Creator, "list-mode-" + name, ExtensionType::CHANNEL) { @@ -45,12 +44,12 @@ void ListModeBase::DisplayList(User* user, Channel* channel) for (const auto& item : cd->list) user->WriteNumeric(listnumeric, channel->name, item.mask, item.setter, item.time); - user->WriteNumeric(endoflistnumeric, channel->name, endofliststring); + user->WriteNumeric(endoflistnumeric, channel->name, InspIRCd::Format("End of channel %s list.", name.c_str())); } void ListModeBase::DisplayEmptyList(User* user, Channel* channel) { - user->WriteNumeric(endoflistnumeric, channel->name, endofliststring); + user->WriteNumeric(endoflistnumeric, channel->name, InspIRCd::Format("Channel %s list is empty.", name.c_str())); } void ListModeBase::RemoveMode(Channel* channel, Modes::ChangeList& changelist) diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp index d19197a81..ee287e3d6 100644 --- a/src/modules/m_autoop.cpp +++ b/src/modules/m_autoop.cpp @@ -36,7 +36,7 @@ class AutoOpList final { public: AutoOpList(Module* Creator) - : ListModeBase(Creator, "autoop", 'w', "End of Channel Access List", RPL_ACCESSLIST, RPL_ENDOFACCESSLIST, true) + : ListModeBase(Creator, "autoop", 'w', RPL_ACCESSLIST, RPL_ENDOFACCESSLIST, true) { ranktoset = ranktounset = OP_VALUE; syntax = "<prefix>:<mask>"; diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index ca0ef5ba3..b81a67b5a 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -41,7 +41,7 @@ class BanException final { public: BanException(Module* Creator) - : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", RPL_EXCEPTLIST, RPL_ENDOFEXCEPTLIST, true) + : ListModeBase(Creator, "banexception", 'e', RPL_EXCEPTLIST, RPL_ENDOFEXCEPTLIST, true) { syntax = "<mask>"; } diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index bf828dd31..f39d13be2 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -42,7 +42,7 @@ public: unsigned long maxlen; ChanFilter(Module* Creator) - : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", RPL_SPAMFILTER, RPL_ENDOFSPAMFILTER, false) + : ListModeBase(Creator, "filter", 'g', RPL_SPAMFILTER, RPL_ENDOFSPAMFILTER, false) { syntax = "<pattern>"; } diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp index 5973b4433..7a6222b12 100644 --- a/src/modules/m_exemptchanops.cpp +++ b/src/modules/m_exemptchanops.cpp @@ -36,7 +36,7 @@ class ExemptChanOps final { public: ExemptChanOps(Module* Creator) - : ListModeBase(Creator, "exemptchanops", 'X', "End of channel exemptchanops list", RPL_EXEMPTIONLIST, RPL_ENDOFEXEMPTIONLIST, false) + : ListModeBase(Creator, "exemptchanops", 'X', RPL_EXEMPTIONLIST, RPL_ENDOFEXEMPTIONLIST, false) { syntax = "<restriction>:<prefix>"; } diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index ca20db943..565bb4bf9 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -38,7 +38,7 @@ class InviteException final { public: InviteException(Module* Creator) - : ListModeBase(Creator, "invex", 'I', "End of Channel Invite Exception List", RPL_INVEXLIST, RPL_ENDOFINVEXLIST, true) + : ListModeBase(Creator, "invex", 'I', RPL_INVEXLIST, RPL_ENDOFINVEXLIST, true) { syntax = "<mask>"; } |