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

ms_cancel: cleanup, consider accounts by equiality instead of sender name to account name

Browse Source
This commit is contained in:
Adam
2016-09-06 14:46:19 -04:00
parent 13c5eec00a
commit d488efdcfe
1 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/commands/ms_cancel.cpp
+37 -17
View File
@@ -34,27 +34,47 @@ class CommandMSCancel : public Command
MemoInfo *mi = MemoInfo::GetMemoInfo(nname, ischan);
if (mi == NULL)
source.Reply(ischan ? CHAN_X_NOT_REGISTERED : _(NICK_X_NOT_REGISTERED), nname.c_str());
{
source.Reply(ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nname.c_str());
return;
}
ChannelInfo *ci = NULL;
NickAlias *na = NULL;
if (ischan)
{
ci = ChannelInfo::Find(nname);
if (ci == NULL)
return; // can't happen
}
else
{
ChannelInfo *ci = NULL;
NickAlias *na = NULL;
if (ischan)
ci = ChannelInfo::Find(nname);
else
na = NickAlias::Find(nname);
for (int i = mi->memos->size() - 1; i >= 0; --i)
if (mi->GetMemo(i)->unread && source.nc->display.equals_ci(mi->GetMemo(i)->sender))
{
FOREACH_MOD(OnMemoDel, (ischan ? ci->name : na->nc->display, mi, mi->GetMemo(i)));
mi->Del(i);
source.Reply(_("Last memo to \002%s\002 has been cancelled."), nname.c_str());
return;
}
na = NickAlias::Find(nname);
source.Reply(_("No memo was cancelable."));
if (na == NULL)
return; // can't happen
}
return;
for (int i = mi->memos->size() - 1; i >= 0; --i)
{
Memo *m = mi->GetMemo(i);
if (!m->unread)
continue;
NickAlias *sender = NickAlias::Find(m->sender);
if (sender && sender->nc == source.GetAccount())
{
FOREACH_MOD(OnMemoDel, (ischan ? ci->name : na->nc->display, mi, m));
mi->Del(i);
source.Reply(_("Last memo to \002%s\002 has been cancelled."), (ischan ? ci->name : na->nc->display).c_str());
return;
}
}
source.Reply(_("No memo was cancelable."));
}
bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override