pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-30 19:46:39 +02:00
Code Activity

regchannels: remove dependency on no-delete-null-pointer-checks

Browse Source
This commit is contained in:
Adam
2023-05-28 21:25:02 -04:00
parent 0646547c9e
commit 66f37139cb
12 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/channels.cpp
+20 -3
View File
@@ -783,7 +783,7 @@ bool Channel::Kick(BotInfo *bi, User *u, const char *reason, ...)
return false;
if (bi == NULL)
bi = this->ci->WhoSends();
bi = this->WhoSends();
EventReturn MOD_RESULT;
FOREACH_RESULT(OnBotKick, MOD_RESULT, (bi, this, u, buf));
@@ -812,7 +812,7 @@ void Channel::ChangeTopic(const Anope::string &user, const Anope::string &newtop
this->topic_setter = user;
this->topic_ts = ts;
IRCD->SendTopic(this->ci->WhoSends(), this);
IRCD->SendTopic(this->WhoSends(), this);
/* Now that the topic is set update the time set. This is *after* we set it so the protocol modules are able to tell the old last set time */
this->topic_time = Anope::CurTime;
@@ -911,8 +911,10 @@ bool Channel::CheckKick(User *user)
if (MOD_RESULT != EVENT_STOP)
return false;
if (mask.empty())
if (mask.empty() && this->ci)
mask = this->ci->GetIdealBan(user);
if (mask.empty())
mask = "*!*@" + user->GetDisplayedHost();
if (reason.empty())
reason = Language::Translate(user->Account(), CHAN_NOT_ALLOWED_TO_JOIN);
@@ -924,6 +926,21 @@ bool Channel::CheckKick(User *user)
return true;
}
BotInfo* Channel::WhoSends() const
{
if (ci)
return ci->WhoSends();
BotInfo *ChanServ = Config->GetClient("ChanServ");
if (ChanServ)
return ChanServ;
if (!BotListByNick->empty())
return BotListByNick->begin()->second;
return NULL;
}
Channel* Channel::Find(const Anope::string &name)
{
channel_map::const_iterator it = ChannelList.find(name);