ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix not being able to message ulines when m_restrictmsg is loaded.

Browse Source
This commit is contained in:
Peter Powell 2015-04-28 20:22:34 +01:00
parent 1548078e5d
commit 15b0a1853d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/conf/modules.conf.example
View File

@ -1486,6 +1486,9 @@
# You probably *DO NOT* want to load this module on a public network.
#
#<module name="m_restrictmsg.so">
#
# Uncomment this to allow users to message ulines (e.g. services):
#<restrictmsg uline="yes">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# R-Line module: Ban users through regular expression patterns.

12
src/modules/m_restrictmsg.cpp
View File

@ -26,15 +26,22 @@
class ModuleRestrictMsg : public Module
{
private:
bool uline;
public:
void init()
{
Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
OnRehash(NULL);
Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
void OnRehash(User*)
{
uline = ServerInstance->Config->ConfValue("restrictmsg")->getBool("uline", false);
}
virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
@ -45,8 +52,9 @@ class ModuleRestrictMsg : public Module
// message allowed if:
// (1) the sender is opered
// (2) the recipient is opered
// (3) the recipient is on a ulined server
// anything else, blocked.
if (IS_OPER(u) || IS_OPER(user))
if (IS_OPER(u) || IS_OPER(user) || (uline && ServerInstance->ULine(u->server)))
{
return MOD_RES_PASSTHRU;
}