pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-25 11:56:37 +02:00
Code Activity

Extract should privmsg logic to its own function.

Browse Source
This commit is contained in:
Sadie Powell
2024-02-26 14:41:50 +00:00
parent cabaa079df
commit 83dd96b9f2
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/users.cpp
+10 -8
View File
@@ -338,17 +338,10 @@ namespace
{
const char *translated_message = Language::Translate(target, msg.c_str());
/* Send privmsg instead of notice if:
* - UsePrivmsg is enabled
* - The user is not registered and NSDefMsg is enabled
* - The user is registered and has set /ns set msg on
*/
auto account = target->Account();
bool send_privmsg = Config->UsePrivmsg && ((!account && Config->DefPrivmsg) || (account && account->HasExt("MSG")));
sepstream sep(translated_message, '\n', true);
for (Anope::string tok; sep.GetToken(tok);)
{
if (send_privmsg)
if (target->ShouldPrivmsg())
IRCD->SendPrivmsgInternal(source, target->GetUID(), tok, tags);
else
IRCD->SendNoticeInternal(source, target->GetUID(), tok, tags);
@@ -859,6 +852,15 @@ bool User::BadPassword()
return false;
}
bool User::ShouldPrivmsg() const
{
// Send a PRIVMSG instead of a NOTICE if:
// 1. options:useprivmsg is enabled.
// 2. The user is not registered and msg is in nickserv:defaults.
// 3. The user is registered and has set /ns set message on.
return Config->UsePrivmsg && ((!nc && Config->DefPrivmsg) || (nc && nc->HasExt("MSG")));
}
User* User::Find(const Anope::string &name, bool nick_only)
{
if (!nick_only && IRCD && IRCD->RequiresID)