From 69401aa1eae449f4f1bfa9bcfe5027630e7f2ee5 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 5 Mar 2021 03:32:10 +0000 Subject: Rename gecosban to realnameban. --- src/modules/m_chgname.cpp | 2 +- src/modules/m_gecosban.cpp | 85 ------------------------------------------- src/modules/m_realnameban.cpp | 85 +++++++++++++++++++++++++++++++++++++++++++ src/modules/m_setname.cpp | 2 +- 4 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 src/modules/m_gecosban.cpp create mode 100644 src/modules/m_realnameban.cpp (limited to 'src/modules') diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index 9568abc4c..2e8db5d4b 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -83,7 +83,7 @@ class ModuleChgName : public Module public: ModuleChgName() - : Module(VF_VENDOR | VF_OPTCOMMON, "Adds the /CHGNAME command which allows server operators to change the real name (gecos) of a user.") + : Module(VF_VENDOR | VF_OPTCOMMON, "Adds the /CHGNAME command which allows server operators to change the real name of a user.") , cmd(this) { } diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp deleted file mode 100644 index edcad7b9c..000000000 --- a/src/modules/m_gecosban.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2015 Renegade334 - * Copyright (C) 2013, 2018, 2020 Sadie Powell - * Copyright (C) 2012 Robby - * Copyright (C) 2010 Craig Edwards - * Copyright (C) 2009 Uli Schlachter - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2008 Robin Burchell - * - * This file is part of InspIRCd. InspIRCd is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include "inspircd.h" -#include "modules/extban.h" - -class RealMaskExtBan - : public ExtBan::MatchingBase -{ - public: - RealMaskExtBan(Module* Creator) - : ExtBan::MatchingBase(Creator, "realmask", 'a') - { - } - - bool IsMatch(User* user, Channel* channel, const std::string& text) override - { - // Check that the user actually specified a real name. - const size_t divider = text.find('+', 1); - if (divider == std::string::npos) - return false; - - // Check whether the user's mask matches. - if (!channel->CheckBan(user, text.substr(0, divider))) - return false; - - // Check whether the user's real name matches. - return InspIRCd::Match(user->GetRealName(), text.substr(divider + 1)); - } -}; - -class RealNameExtBan - : public ExtBan::MatchingBase -{ - public: - RealNameExtBan(Module* Creator) - : ExtBan::MatchingBase(Creator, "realname", 'r') - { - } - - bool IsMatch(User* user, Channel* channel, const std::string& text) override - { - return InspIRCd::Match(user->GetRealName(), text); - } -}; - -class ModuleGecosBan - : public Module -{ - private: - RealMaskExtBan maskextban; - RealNameExtBan realextban; - - public: - ModuleGecosBan() - : Module(VF_VENDOR | VF_OPTCOMMON, "Adds the r: extended ban which checks whether users have a real name (gecos) matching the specified glob pattern.") - , maskextban(this) - , realextban(this) - { - } -}; - -MODULE_INIT(ModuleGecosBan) diff --git a/src/modules/m_realnameban.cpp b/src/modules/m_realnameban.cpp new file mode 100644 index 000000000..581c8aa7e --- /dev/null +++ b/src/modules/m_realnameban.cpp @@ -0,0 +1,85 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2015 Renegade334 + * Copyright (C) 2013, 2018, 2020 Sadie Powell + * Copyright (C) 2012 Robby + * Copyright (C) 2010 Craig Edwards + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include "inspircd.h" +#include "modules/extban.h" + +class RealMaskExtBan + : public ExtBan::MatchingBase +{ + public: + RealMaskExtBan(Module* Creator) + : ExtBan::MatchingBase(Creator, "realmask", 'a') + { + } + + bool IsMatch(User* user, Channel* channel, const std::string& text) override + { + // Check that the user actually specified a real name. + const size_t divider = text.find('+', 1); + if (divider == std::string::npos) + return false; + + // Check whether the user's mask matches. + if (!channel->CheckBan(user, text.substr(0, divider))) + return false; + + // Check whether the user's real name matches. + return InspIRCd::Match(user->GetRealName(), text.substr(divider + 1)); + } +}; + +class RealNameExtBan + : public ExtBan::MatchingBase +{ + public: + RealNameExtBan(Module* Creator) + : ExtBan::MatchingBase(Creator, "realname", 'r') + { + } + + bool IsMatch(User* user, Channel* channel, const std::string& text) override + { + return InspIRCd::Match(user->GetRealName(), text); + } +}; + +class ModuleGecosBan + : public Module +{ + private: + RealMaskExtBan maskextban; + RealNameExtBan realextban; + + public: + ModuleGecosBan() + : Module(VF_VENDOR | VF_OPTCOMMON, "Adds the r: extended ban which checks whether users have a real name matching the specified glob pattern.") + , maskextban(this) + , realextban(this) + { + } +}; + +MODULE_INIT(ModuleGecosBan) diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index a55c0bfeb..37f17be8c 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -74,7 +74,7 @@ class ModuleSetName : public Module public: ModuleSetName() - : Module(VF_VENDOR, "Adds the /SETNAME command which allows users to change their real name (gecos).") + : Module(VF_VENDOR, "Adds the /SETNAME command which allows users to change their real name.") , cmd(this) , setnameevprov(this, "SETNAME") { -- cgit v1.3.1-10-gc9f91