Skip to content

Commit 6b34ce9

Browse files
syzopsyzop
authored
Update five modules to work with 6.2.0 (PR #130 from ValwareIRC/unreal6)
Update modules (by Valware) for U6.2
2 parents 9fb68fc + f139747 commit 6b34ce9

File tree

5 files changed

+89
-43
lines changed

5 files changed

+89
-43
lines changed

‎files/elmer.c‎

Lines changed: 51 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Licence: GPLv3
3-
Copyright Ⓒ 2022 Valerie Pond
3+
Copyright Ⓒ 2022-2025 Valerie Pond
44
Elmer
55
66
Force a user to speak like Elmer Fudd
@@ -29,9 +29,11 @@ module
2929

3030
#include "unrealircd.h"
3131

32+
ModDataInfo *elmer_md;
33+
3234
ModuleHeader MOD_HEADER = {
3335
"third/elmer",
34-
"2.2",
36+
"2.3",
3537
"Make people talk like Elmer",
3638
"Valware",
3739
"unrealircd-6",
@@ -54,8 +56,53 @@ void elmer_unserialize(const char *str, ModData *m);
5456

5557
static char *convert_to_elmer(char *line);
5658

57-
int elmer_chanmsg(Client *client, Channel *channel, Membership *lp, const char **msg, const char **errmsg, SendType sendtype);
58-
int elmer_usermsg(Client *client, Client *target, const char **msg, const char **errmsg, SendType sendtype);
59+
#if UNREAL_VERSION >= 0x06020000
60+
int elmer_chanmsg(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype, ClientContext *clictx)
61+
{
62+
static char retbuf[512];
63+
if (IsElmer(client))
64+
{
65+
strlcpy(retbuf, *text, sizeof(retbuf));
66+
*text = convert_to_elmer(retbuf);
67+
}
68+
return 0;
69+
}
70+
71+
int elmer_usermsg(Client *client, Client *target, const char **text, const char **errmsg, SendType sendtype, ClientContext *clictx)
72+
{
73+
static char retbuf[512];
74+
if (IsElmer(client) && !IsULine(target))
75+
{
76+
strlcpy(retbuf, *text, sizeof(retbuf));
77+
*text = convert_to_elmer(retbuf);
78+
}
79+
return 0;
80+
}
81+
#else
82+
int elmer_chanmsg(Client *client, Channel *channel, Membership *lp, const char **msg, const char **errmsg, SendType sendtype)
83+
{
84+
static char retbuf[512];
85+
if (IsElmer(client))
86+
{
87+
strlcpy(retbuf, *msg, sizeof(retbuf));
88+
*msg = convert_to_elmer(retbuf);
89+
}
90+
return 0;
91+
}
92+
93+
int elmer_usermsg(Client *client, Client *target, const char **msg, const char **errmsg, SendType sendtype)
94+
{
95+
static char retbuf[512];
96+
if (IsElmer(client) && !IsULine(target))
97+
{
98+
strlcpy(retbuf, *msg, sizeof(retbuf));
99+
*msg = convert_to_elmer(retbuf);
100+
}
101+
return 0;
102+
}
103+
#endif
104+
105+
59106

60107
static void dumpit(Client *client, char **p);
61108

@@ -85,7 +132,6 @@ static char *help_elmer[] = {
85132
"-",
86133
NULL
87134
};
88-
ModDataInfo *elmer_md;
89135

90136

91137

@@ -268,29 +314,6 @@ CMD_FUNC(DELELMER)
268314
return;
269315
}
270316

271-
int elmer_chanmsg(Client *client, Channel *channel, Membership *lp, const char **msg, const char **errmsg, SendType sendtype)
272-
{
273-
static char retbuf[512];
274-
if (IsElmer(client))
275-
{
276-
strlcpy(retbuf, *msg, sizeof(retbuf));
277-
*msg = convert_to_elmer(retbuf);
278-
}
279-
return 0;
280-
}
281-
282-
int elmer_usermsg(Client *client, Client *target, const char **msg, const char **errmsg, SendType sendtype)
283-
{
284-
static char retbuf[512];
285-
if (IsElmer(client) && !IsULine(target))
286-
{
287-
strlcpy(retbuf, *msg, sizeof(retbuf));
288-
*msg = convert_to_elmer(retbuf);
289-
}
290-
return 0;
291-
}
292-
293-
294317
static char *convert_to_elmer(char *line)
295318
{
296319
char *p;

‎files/lockserv.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Licence: GPLv3 or later
3-
Copyright Ⓒ 2022 Valerie Pond
3+
Copyright Ⓒ 2022-2025 Valerie Pond
44
LockServ
55
66
Locks a server (stops incoming connections)
@@ -24,11 +24,9 @@ module
2424

2525
#include "unrealircd.h"
2626

27-
28-
2927
ModuleHeader MOD_HEADER = {
3028
"third/lockserv",
31-
"1.1",
29+
"1.2",
3230
"Adds the /lockserv command which allows privileged server operators to prevent connections to a particular server.",
3331
"Valware",
3432
"unrealircd-6",
@@ -394,5 +392,5 @@ CMD_OVERRIDE_FUNC(lockserv_cap_ovr)
394392
if (IsServerLocked(server) && !find_tkl_exception(TKL_ZAP, client) && !IsRegistered(client))
395393
return;
396394

397-
CallCommandOverride(ovr, client, recv_mtags, parc, parv);
395+
CALL_NEXT_COMMAND_OVERRIDE();
398396
}

‎files/mute.c‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* LICENSE: GPLv3-or-later
3-
* Copyright Ⓒ 2022 Valerie Pond
3+
* Copyright Ⓒ 2022-2025 Valerie Pond
44
*
55
*/
66

@@ -25,7 +25,7 @@ module
2525
ModuleHeader MOD_HEADER
2626
= {
2727
"third/mute",
28-
"1.5",
28+
"1.6",
2929
"Globally mute a user",
3030
"Valware",
3131
"unrealircd-6",
@@ -62,8 +62,15 @@ const char *mute_serialize(ModData *m);
6262
void mute_unserialize(const char *str, ModData *m);
6363
void setconf(void);
6464
void freeconf(void);
65+
66+
#if UNREAL_VERSION >= 0x06020000
67+
int mutecheck_chmsg(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype, ClientContext *clictx);
68+
int mutecheck_usermsg(Client *client, Client *target, const char **text, const char **errmsg, SendType sendtype, ClientContext *clictx);
69+
#else
6570
int mutecheck_chmsg(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype);
6671
int mutecheck_usermsg(Client *client, Client *target, const char **text, const char **errmsg, SendType sendtype);
72+
#endif
73+
6774
int mute_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
6875
int mute_configrun(ConfigFile *cf, ConfigEntry *ce, int type);
6976
int who_the_hell_be_muted_lol(Client *client, Client *target, NameValuePrioList **list);
@@ -346,7 +353,11 @@ CMD_FUNC(CMD_UNMUTE)
346353
log_data_client("target", target));
347354
}
348355

356+
#if UNREAL_VERSION >= 0x06020000
357+
int mutecheck_chmsg(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype, ClientContext *clictx)
358+
#else
349359
int mutecheck_chmsg(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype)
360+
#endif
350361
{
351362
if (IsMuted(client) && strcasecmp(iConf.helpchan, channel->name))
352363
{
@@ -360,7 +371,13 @@ int mutecheck_chmsg(Client *client, Channel *channel, Membership *member, const
360371
}
361372
return HOOK_CONTINUE;
362373
}
374+
375+
376+
#if UNREAL_VERSION >= 0x06020000
377+
int mutecheck_usermsg(Client *client, Client *target, const char **text, const char **errmsg, SendType sendtype, ClientContext *clictx)
378+
#else
363379
int mutecheck_usermsg(Client *client, Client *target, const char **text, const char **errmsg, SendType sendtype)
380+
#endif
364381
{
365382
if (IsMuted(client) && (!IsOper(target) || IsULine(target)))
366383
{

‎files/nicklock.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Licence: GPLv3
3-
Copyright Ⓒ 2022 Valerie Pond
3+
Copyright Ⓒ 2022-2025 Valerie Pond
44
NickLock
55
66
Changes the user's nick to the new nick, and forces
@@ -16,7 +16,7 @@ module
1616
{
1717
documentation "https://github.com/ValwareIRC/valware-unrealircd-mods/blob/main/nicklock/README.md";
1818
troubleshooting "In case of problems, documentation or e-mail me at [email protected]";
19-
min-unrealircd-version "6.1.*";
19+
min-unrealircd-version "6.*";
2020
max-unrealircd-version "6.*";
2121
post-install-text {
2222
"The module is installed. Now all you need to do is add a loadmodule line:";
@@ -32,7 +32,7 @@ module
3232

3333
ModuleHeader MOD_HEADER = {
3434
"third/nicklock",
35-
"1.2",
35+
"1.3",
3636
"Adds the /NICKLOCK command which allows server operators to prevent a user from changing their nick during their session.",
3737
"Valware",
3838
"unrealircd-6",
@@ -252,7 +252,7 @@ CMD_OVERRIDE_FUNC(nick_override)
252252
{
253253
if (!IsNickLock(client))
254254
{
255-
CallCommandOverride(ovr, client, recv_mtags, parc, parv);
255+
CALL_NEXT_COMMAND_OVERRIDE();
256256
return;
257257
}
258258
sendnumeric(client, ERR_CANNOTDOCOMMAND, "NICK", "You have been blocked from changing nicks by an administrator.");

‎files/reduced-moderation.c‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module
3232
ModuleHeader MOD_HEADER
3333
= {
3434
"third/reduced-moderation",
35-
"1.1",
35+
"1.2",
3636
"Reduced Moderation mode (+x)",
3737
"Valware",
3838
"unrealircd-6",
@@ -42,7 +42,11 @@ ModuleHeader MOD_HEADER
4242
Cmode_t EXTCMODE_REDMOD;
4343

4444
/* Forward declarations */
45-
int redmod_can_send_to_channel(Client *client, Channel *channel, Membership *lp, const char **msg, const char **errmsg, SendType sendtype);
45+
#if UNREAL_VERSION >= 0x06020000
46+
int redmod_can_send_to_channel(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype, ClientContext *clictx);
47+
#else
48+
int redmod_can_send_to_channel(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype);
49+
#endif
4650
const char *redmod_pre_local_part(Client *client, Channel *channel, const char *text);
4751

4852
/* Macros */
@@ -77,10 +81,14 @@ MOD_UNLOAD()
7781
}
7882

7983
/* Overrides for +m also will override +x */
80-
int redmod_can_send_to_channel(Client *client, Channel *channel, Membership *m, const char **text, const char **errmsg, SendType sendtype)
84+
#if UNREAL_VERSION >= 0x06020000
85+
int redmod_can_send_to_channel(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype, ClientContext *clictx);
86+
#else
87+
int redmod_can_send_to_channel(Client *client, Channel *channel, Membership *member, const char **text, const char **errmsg, SendType sendtype);
88+
#endif
8189
{
8290
MessageTag *mtags = NULL;
83-
if (IsRedMod(channel) && (!m || !check_channel_access_membership(m, "vhoaq")) &&
91+
if (IsRedMod(channel) && (!member || !check_channel_access_membership(member, "vhoaq")) &&
8492
!op_can_override("channel:override:message:moderated",client,channel,NULL))
8593
{
8694
Hook *h;

0 commit comments

Comments
 (0)