diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-10-20 06:24:19 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-11-06 10:55:56 +0000 |
| commit | 8281315255d30d7cad6da4936cf9276b7f58a4dc (patch) | |
| tree | 4e2f6a1293c87037a69a9219154d4a5e05ad7dd1 /src | |
| parent | 257bf752fc6b87fa35bfa8cf95fc37730c3d55c6 (diff) | |
Move depriv from m_customprefix into PrefixMode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mode.cpp | 11 | ||||
| -rw-r--r-- | src/modules/m_customprefix.cpp | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/mode.cpp b/src/mode.cpp index cff625c46..fd25a9a9f 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -162,11 +162,20 @@ void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool) PrefixMode::PrefixMode(Module* Creator, const std::string& Name, char ModeLetter, unsigned int Rank, char PrefixChar) : ModeHandler(Creator, Name, ModeLetter, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_PREFIX) - , prefix(PrefixChar), prefixrank(Rank) + , prefix(PrefixChar) + , prefixrank(Rank) + , selfremove(true) { list = true; } +ModResult PrefixMode::AccessCheck(User* src, Channel*, std::string& value, bool adding) +{ + if (!adding && src->nick == value && selfremove) + return MOD_RES_ALLOW; + return MOD_RES_PASSTHRU; +} + ModeAction PrefixMode::OnModeChange(User* source, User*, Channel* chan, std::string& parameter, bool adding) { User* target; diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp index 1be9676b5..7e162c72a 100644 --- a/src/modules/m_customprefix.cpp +++ b/src/modules/m_customprefix.cpp @@ -23,7 +23,6 @@ class CustomPrefixMode : public PrefixMode { public: reference<ConfigTag> tag; - bool depriv; CustomPrefixMode(Module* parent, ConfigTag* Tag) : PrefixMode(parent, Tag->getString("name"), 0, Tag->getInt("rank")) @@ -35,14 +34,7 @@ class CustomPrefixMode : public PrefixMode mode = v.c_str()[0]; ranktoset = tag->getInt("ranktoset", prefixrank, prefixrank, UINT_MAX); ranktounset = tag->getInt("ranktounset", ranktoset, ranktoset, UINT_MAX); - depriv = tag->getBool("depriv", true); - } - - ModResult AccessCheck(User* src, Channel*, std::string& value, bool adding) - { - if (!adding && src->nick == value && depriv) - return MOD_RES_ALLOW; - return MOD_RES_PASSTHRU; + selfremove = tag->getBool("depriv", true); } }; |