aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_account.cpp4
-rw-r--r--src/modules/m_alias.cpp2
-rw-r--r--src/modules/m_anticaps.cpp2
-rw-r--r--src/modules/m_blockcolor.cpp2
-rw-r--r--src/modules/m_botmode.cpp2
-rw-r--r--src/modules/m_callerid.cpp4
-rw-r--r--src/modules/m_chanfilter.cpp2
-rw-r--r--src/modules/m_commonchans.cpp4
-rw-r--r--src/modules/m_dccallow.cpp2
-rw-r--r--src/modules/m_deaf.cpp4
-rw-r--r--src/modules/m_delaymsg.cpp8
-rw-r--r--src/modules/m_filter.cpp4
-rw-r--r--src/modules/m_ircv3_ctctags.cpp4
-rw-r--r--src/modules/m_ircv3_echomessage.cpp6
-rw-r--r--src/modules/m_ircv3_msgid.cpp4
-rw-r--r--src/modules/m_messageflood.cpp4
-rw-r--r--src/modules/m_muteban.cpp4
-rw-r--r--src/modules/m_noctcp.cpp2
-rw-r--r--src/modules/m_nonotice.cpp2
-rw-r--r--src/modules/m_opmoderated.cpp4
-rw-r--r--src/modules/m_repeat.cpp2
-rw-r--r--src/modules/m_restrictmsg.cpp4
-rw-r--r--src/modules/m_silence.cpp4
-rw-r--r--src/modules/m_sslmodes.cpp4
-rw-r--r--src/modules/m_stripcolor.cpp2
25 files changed, 44 insertions, 42 deletions
diff --git a/src/modules/m_account.cpp b/src/modules/m_account.cpp
index 03426cbe4..2e1be2313 100644
--- a/src/modules/m_account.cpp
+++ b/src/modules/m_account.cpp
@@ -265,12 +265,12 @@ public:
return MOD_RES_PASSTHRU;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return HandleMessage(user, target);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return HandleMessage(user, target);
}
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index e7312138a..35533566b 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -190,7 +190,7 @@ public:
return MOD_RES_PASSTHRU;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
// Don't echo anything which is caused by an alias.
if (active)
diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp
index ade189840..c0067e4e8 100644
--- a/src/modules/m_anticaps.cpp
+++ b/src/modules/m_anticaps.cpp
@@ -199,7 +199,7 @@ public:
lowercase.set(static_cast<unsigned char>(chr));
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
// We only want to operate on messages from local users.
if (!IS_LOCAL(user))
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 654a173ff..d48957162 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -49,7 +49,7 @@ public:
{
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
{
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 0060bb7da..ed0d6738a 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -82,7 +82,7 @@ public:
tokens["BOT"] = ConvToStr(bm.GetModeChar());
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
// Allow sending if forcenotice is off, the user is not a bot, or if the message is a notice.
if (!forcenotice || !user->IsModeSet(bm) || details.type == MessageType::NOTICE)
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 0cd84da5e..67dd92560 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -436,12 +436,12 @@ public:
return MOD_RES_PASSTHRU;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return HandleMessage(user, target);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return HandleMessage(user, target);
}
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index dfa8ba0ca..df95cc915 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -149,7 +149,7 @@ public:
}
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
if (target.type != MessageTarget::TYPE_CHANNEL)
return MOD_RES_PASSTHRU;
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 03abae1cd..8afbfd038 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -73,12 +73,12 @@ public:
return MOD_RES_DENY;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return HandleMessage(user, target);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return HandleMessage(user, target);
}
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 254d845da..fca57143d 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -418,7 +418,7 @@ public:
RemoveNick(user);
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
if (!IS_LOCAL(user))
return MOD_RES_PASSTHRU;
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index d2df5d50f..9bdca4546 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -141,7 +141,7 @@ public:
privdeafservice = tag->getBool("privdeafservice", tag->getBool("privdeafuline", true));
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
switch (target.type)
{
@@ -158,7 +158,7 @@ public:
return MOD_RES_PASSTHRU;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
switch (target.type)
{
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 943010738..9a60c1514 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -72,8 +72,8 @@ public:
}
void OnUserJoin(Membership* memb, bool sync, bool created, CUList&) override;
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override;
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override;
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override;
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override;
};
bool DelayMsgMode::OnSet(User* source, Channel* chan, std::string& parameter)
@@ -101,12 +101,12 @@ void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CULis
}
}
-ModResult ModuleDelayMsg::OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details)
+ModResult ModuleDelayMsg::OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details)
{
return HandleMessage(user, target);
}
-ModResult ModuleDelayMsg::OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details)
+ModResult ModuleDelayMsg::OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details)
{
return HandleMessage(user, target);
}
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 7c13ae62c..fa257a808 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -228,7 +228,7 @@ public:
ModuleFilter();
void init() override;
Cullable::Result Cull() override;
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override;
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override;
const FilterResult* FilterMatch(User* user, const std::string& text, int flags);
bool DeleteFilter(const std::string& freeform, std::string& reason);
std::pair<bool, std::string> AddFilter(const std::string& freeform, FilterAction type, const std::string& reason, unsigned long duration, const std::string& flags, bool config = false);
@@ -386,7 +386,7 @@ void ModuleFilter::FreeFilters()
dirty = true;
}
-ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtarget, MessageDetails& details)
+ModResult ModuleFilter::OnUserPreMessage(User* user, MessageTarget& msgtarget, MessageDetails& details)
{
// Leave remote users and servers alone
if (!IS_LOCAL(user))
diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index 9af2f52ad..435e6cf31 100644
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -362,12 +362,12 @@ public:
tokens["CLIENTTAGDENY"] = "*";
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return CopyClientTags(details.tags_in, details.tags_out);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
if (IS_LOCAL(user) && target.type == MessageTarget::TYPE_CHANNEL)
{
diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp
index 7677c3d7d..59cb22c70 100644
--- a/src/modules/m_ircv3_echomessage.cpp
+++ b/src/modules/m_ircv3_echomessage.cpp
@@ -92,7 +92,8 @@ public:
case MessageTarget::TYPE_CHANNEL:
{
Channel* chan = target.Get<Channel>();
- ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, chan, text, details.type, target.status);
+ const char status = details.echo_original ? target.original_status : target.status;
+ ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, chan, text, details.type, status);
privmsg.AddTags(tags);
AddEchoTag(privmsg);
localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
@@ -132,7 +133,8 @@ public:
case MessageTarget::TYPE_CHANNEL:
{
Channel* chan = target.Get<Channel>();
- CTCTags::TagMessage message(user, chan, tags, target.status);
+ const char status = details.echo_original ? target.original_status : target.status;
+ CTCTags::TagMessage message(user, chan, tags, status);
AddEchoTag(message);
localuser->Send(tagmsgprov, message);
break;
diff --git a/src/modules/m_ircv3_msgid.cpp b/src/modules/m_ircv3_msgid.cpp
index 96c6b2f47..fb7cc7b09 100644
--- a/src/modules/m_ircv3_msgid.cpp
+++ b/src/modules/m_ircv3_msgid.cpp
@@ -92,12 +92,12 @@ public:
{
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return CopyMessageId(details.tags_in, details.tags_out);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return CopyMessageId(details.tags_in, details.tags_out);
}
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index d5f27f47e..76b88e2aa 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -335,12 +335,12 @@ public:
return MOD_RES_PASSTHRU;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return HandleMessage(user, target, (details.type == MessageType::PRIVMSG ? privmsg : notice));
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return HandleMessage(user, target, tagmsg);
}
diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 96e7beba7..ed1a80493 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -70,12 +70,12 @@ public:
return MOD_RES_PASSTHRU;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return HandleMessage(user, target, details.echo_original);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return HandleMessage(user, target, details.echo_original);
}
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 7c795bfc3..e0dd6bae2 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -49,7 +49,7 @@ public:
{
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
if (!IS_LOCAL(user))
return MOD_RES_PASSTHRU;
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index ab853276b..8675c920d 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -47,7 +47,7 @@ public:
{
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
if ((details.type == MessageType::NOTICE) && (target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
{
diff --git a/src/modules/m_opmoderated.cpp b/src/modules/m_opmoderated.cpp
index 2ef9774c3..f69794b8d 100644
--- a/src/modules/m_opmoderated.cpp
+++ b/src/modules/m_opmoderated.cpp
@@ -76,12 +76,12 @@ public:
{
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return HandleMessage(user, target, details.exemptions);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return HandleMessage(user, target, details.exemptions);
}
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 1d62b1065..ae283f001 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -454,7 +454,7 @@ public:
rm.Resize(tag->getNum<size_t>("size", 512, 1, ServerInstance->Config->Limits.MaxLine));
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
if (target.type != MessageTarget::TYPE_CHANNEL || !IS_LOCAL(user))
return MOD_RES_PASSTHRU;
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index ab8f702ef..1810fd2c6 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -61,12 +61,12 @@ public:
{
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return HandleMessage(user, target);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return HandleMessage(user, target);
}
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 91a2d4c8a..1baa59c48 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -497,7 +497,7 @@ public:
return CanReceiveMessage(source, dest, SilenceEntry::SF_INVITE) ? MOD_RES_PASSTHRU : MOD_RES_DENY;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
std::string_view ctcpname;
bool is_ctcp = details.IsCTCP(ctcpname) && !irc::equals(ctcpname, "ACTION");
@@ -559,7 +559,7 @@ public:
return MOD_RES_PASSTHRU;
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
if (target.type == MessageTarget::TYPE_CHANNEL)
{
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 496c64d6b..e37e78fa3 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -237,12 +237,12 @@ public:
return MOD_RES_PASSTHRU;
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
return HandleMessage(user, target);
}
- ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) override
+ ModResult OnUserPreTagMessage(User* user, MessageTarget& target, CTCTags::TagMessageDetails& details) override
{
return HandleMessage(user, target);
}
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index fcfd789eb..91e5d8e95 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -49,7 +49,7 @@ public:
{
}
- ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
+ ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
{
if (!IS_LOCAL(user))
return MOD_RES_PASSTHRU;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-07-07 07:27:48 +0000