#include "inspircd.h"
-/* $ModDesc: Provides usermode +d to block channel messages and channel notices */
-
/** User mode +d - filter out channel messages and channel notices
*/
class User_d : public ModeHandler
{
}
- void init() CXX11_OVERRIDE
- {
- ServerInstance->Modules->AddService(m1);
-
- OnRehash(NULL);
- Implementation eventlist[] = { I_OnUserPreMessage, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
- }
-
- void OnRehash(User* user) CXX11_OVERRIDE
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
ConfigTag* tag = ServerInstance->Config->ConfValue("deaf");
deaf_bypasschars = tag->getString("bypasschars");
ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
{
- if (target_type == TYPE_CHANNEL)
- {
- Channel* chan = (Channel*)dest;
- if (chan)
- this->BuildDeafList(msgtype, chan, user, status, text, exempt_list);
- }
-
- return MOD_RES_PASSTHRU;
- }
+ if (target_type != TYPE_CHANNEL)
+ return MOD_RES_PASSTHRU;
- void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
- {
+ Channel* chan = static_cast<Channel*>(dest);
const UserMembList *ulist = chan->GetUsers();
- bool is_a_uline;
- bool is_bypasschar, is_bypasschar_avail;
- bool is_bypasschar_uline, is_bypasschar_uline_avail;
-
- is_bypasschar = is_bypasschar_avail = is_bypasschar_uline = is_bypasschar_uline_avail = 0;
- if (!deaf_bypasschars.empty())
- {
- is_bypasschar_avail = 1;
- if (deaf_bypasschars.find(text[0], 0) != std::string::npos)
- is_bypasschar = 1;
- }
- if (!deaf_bypasschars_uline.empty())
- {
- is_bypasschar_uline_avail = 1;
- if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos)
- is_bypasschar_uline = 1;
- }
+ bool is_bypasschar = (deaf_bypasschars.find(text[0]) != std::string::npos);
+ bool is_bypasschar_uline = (deaf_bypasschars_uline.find(text[0]) != std::string::npos);
/*
* If we have no bypasschars_uline in config, and this is a bypasschar (regular)
* Than it is obviously going to get through +d, no build required
*/
- if (!is_bypasschar_uline_avail && is_bypasschar)
- return;
+ if (!deaf_bypasschars_uline.empty() && is_bypasschar)
+ return MOD_RES_PASSTHRU;
for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
{
if (is_bypasschar && is_bypasschar_uline)
continue; /* deliver message */
- is_a_uline = ServerInstance->ULine(i->first->server);
+ bool is_a_uline = i->first->server->IsULine();
/* matched a U-line only bypass */
if (is_bypasschar_uline && is_a_uline)
continue; /* deliver message */
if (is_bypasschar && !is_a_uline)
continue; /* deliver message */
- if (status && !strchr(chan->GetAllPrefixChars(i->first), status))
+ if (status && !strchr(i->second->GetAllPrefixChars(), status))
continue;
/* don't deliver message! */
exempt_list.insert(i->first);
}
+
+ return MOD_RES_PASSTHRU;
}
Version GetVersion() CXX11_OVERRIDE