pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-08 13:23:12 +02:00
Code Activity

Move channel mode +m to module chanmodes/moderated

Browse Source 
(and nearly all the code related to it)
This commit is contained in:
Bram Matthys
2021-08-22 12:01:54 +02:00
parent 24f73c28e4
commit 6dd539d760
9 changed files with 106 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/conf/modules.default.conf
+1
View File
@@ -149,6 +149,7 @@ loadmodule "chanmodes/limit"; /* +l */
loadmodule "chanmodes/inviteonly"; /* +i */
loadmodule "chanmodes/secret"; /* +s */
loadmodule "chanmodes/private"; /* +p */
loadmodule "chanmodes/moderated"; /* +m */
loadmodule "chanmodes/noexternalmsgs"; /* +n */
loadmodule "chanmodes/floodprot"; /* +f */
loadmodule "chanmodes/nocolor"; /* +c */
include/struct.h
-1
View File
@@ -2112,7 +2112,6 @@ struct Ban {
/* Don't blindly change these MODE_* values, see comment 20 lines up! */
#define MODE_CHANOP CHFL_CHANOP
#define MODE_VOICE CHFL_VOICE
#define MODE_MODERATED 0x0010
#define MODE_TOPICLIMIT 0x0020
#define MODE_CHANOWNER 0x0040
#define MODE_CHANADMIN 0x0080
src/channel.c
-1
View File
@@ -56,7 +56,6 @@ CoreChannelModeTable corechannelmodetable[] = {
{MODE_VOICE, 'v', 1, 1},
{MODE_HALFOP, 'h', 0, 1},
{MODE_CHANOP, 'o', 0, 1},
{MODE_MODERATED, 'm', 1, 0},
{MODE_TOPICLIMIT, 't', 1, 0},
{MODE_RGSTR, 'r', 0, 0},
{MODE_CHANADMIN, 'a', 0, 1},
src/modules/chanmodes/Makefile.in
+5 -1
View File
@@ -33,7 +33,7 @@ INCLUDES = ../../include/channel.h \
R_MODULES= \
key.so limit.so inviteonly.so secret.so private.so \
noexternalmsgs.so \
moderated.so noexternalmsgs.so \
nocolor.so stripcolor.so issecure.so permanent.so floodprot.so \
noctcp.so link.so censor.so delayjoin.so noknock.so noinvite.so operonly.so \
nonotice.so regonly.so nonickchange.so nokick.so regonlyspeak.so \
@@ -78,6 +78,10 @@ noexternalmsgs.so: noexternalmsgs.c $(INCLUDES)
$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-o noexternalmsgs.so noexternalmsgs.c
moderated.so: moderated.c $(INCLUDES)
$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-o moderated.so moderated.c
issecure.so: issecure.c $(INCLUDES)
$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-o issecure.so issecure.c
src/modules/chanmodes/moderated.c
+95
View File
@@ -0,0 +1,95 @@
/*
* Channel Mode +m
* (C) Copyright 2021 Syzop and the UnrealIRCd team
*
* This program 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; either version 1, or (at your option)
* any later version.
*
* 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, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "unrealircd.h"
ModuleHeader MOD_HEADER
= {
"chanmodes/moderated",
"6.0",
"Channel Mode +m",
"UnrealIRCd Team",
"unrealircd-6",
};
Cmode_t EXTCMODE_MODERATED;
#define IsModerated(channel) (channel->mode.extmode & EXTCMODE_MODERATED)
int moderated_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, SendType sendtype);
char *moderated_pre_local_part(Client *client, Channel *channel, char *text);
MOD_INIT()
{
CmodeInfo req;
MARK_AS_OFFICIAL_MODULE(modinfo);
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'm';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_MODERATED);
HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, moderated_can_send_to_channel);
HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_PART, 0, moderated_pre_local_part);
return MOD_SUCCESS;
}
MOD_LOAD()
{
return MOD_SUCCESS;
}
MOD_UNLOAD()
{
return MOD_SUCCESS;
}
int moderated_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, SendType sendtype)
{
if (IsModerated(channel) && (!lp || !(lp->flags & CHFL_OVERLAP)) &&
!op_can_override("channel:override:message:moderated",client,channel,NULL))
{
Hook *h;
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
int i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_MODERATED);
if (i == HOOK_ALLOW)
return HOOK_CONTINUE; /* bypass +m restriction */
if (i != HOOK_CONTINUE)
break;
}
*errmsg = "You need voice (+v)";
return HOOK_DENY; /* BLOCK message */
}
return HOOK_CONTINUE;
}
/** Remove PART reason too if the channel is +m, -t, and user not +vhoaq */
char *moderated_pre_local_part(Client *client, Channel *channel, char *text)
{
if (IsModerated(channel) && !has_voice(client, channel) && !is_half_op(client, channel))
return NULL;
return text;
}
src/modules/message.c
-20
View File
@@ -796,26 +796,6 @@ int _can_send_to_channel(Client *client, Channel *channel, char **msgtext, char
member = IsMember(client, channel);
lp = find_membership_link(client->user->channel, channel);
if (channel->mode.mode & MODE_MODERATED &&
!op_can_override("channel:override:message:moderated",client,channel,NULL) &&
(!lp /* FIXME: UGLY */
|| !(lp->flags & (CHFL_CHANOP | CHFL_VOICE | CHFL_CHANOWNER | CHFL_HALFOP | CHFL_CHANADMIN))))
{
/* Channel is moderated (+m).
* Reject, unless HOOKTYPE_CAN_BYPASS_MODERATED tells otherwise.
*/
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_MODERATED);
if (i != HOOK_CONTINUE)
break;
}
if (i != HOOK_ALLOW)
{
*errmsg = "You need voice (+v)";
return 0;
}
}
/* Modules can plug in as well */
for (h = Hooks[HOOKTYPE_CAN_SEND_TO_CHANNEL]; h; h = h->next)
src/modules/mode.c
-1
View File
@@ -785,7 +785,6 @@ int do_mode_char(Channel *channel, long modetype, char modechar, char *param,
break;
}
goto setmode;
case MODE_MODERATED:
case MODE_TOPICLIMIT:
goto setmode;
setmode:
src/modules/part.c
-6
View File
@@ -136,12 +136,6 @@ CMD_FUNC(cmd_part)
comment = NULL;
if (comment && is_banned(client, channel, BANCHK_LEAVE_MSG, &comment, NULL))
comment = NULL;
/* Same for +m */
if ((channel->mode.mode & MODE_MODERATED) && comment &&
!has_voice(client, channel) && !is_half_op(client, channel))
{
comment = NULL;
}
}
if (MyConnect(client))
src/modules/topic.c
+5 -2
View File
@@ -216,8 +216,11 @@ CMD_FUNC(cmd_topic)
if (MyUser(client) && newtopic)
topic = newtopic; /* process is_banned() changes of topic (eg: text replacement), but only for local clients */
/* -t, +m, and not +vhoaq */
if (((flags&CHFL_OVERLAP) == 0) && (channel->mode.mode & MODE_MODERATED))
/* -t, +m, and not +vhoaq
* TODO: it's not really sane to have this here, we could use HOOKTYPE_PRE_LOCAL_TOPIC,
* but then we have the override shit too, hmmm.
*/
if (((flags&CHFL_OVERLAP) == 0) && has_channel_mode(channel, 'm'))
{
char buf[512];