pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 13:26:39 +02:00
Code Activity

Fix some inconsistencies with account lookups.

Browse Source
This commit is contained in:
Sadie Powell
2025-05-17 15:05:13 +01:00
parent 0fc1eb3133
commit d3bb930a5e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/account.h
+2 -2
View File
@@ -113,7 +113,7 @@ public:
* @return the nick, if found
*/
static NickAlias *Find(const Anope::string &nick);
static NickAlias *FindId(uint64_t id);
static NickAlias *FindId(uint64_t uid);
};
/* A registered account. Each account must have a NickAlias with the same nick as the
@@ -195,7 +195,7 @@ public:
* @return The account, if it exists
*/
static NickCore *Find(const Anope::string &nick);
static NickCore *FindId(uint64_t id);
static NickCore *FindId(uint64_t uid);
void AddChannelReference(ChannelInfo *ci);
void RemoveChannelReference(ChannelInfo *ci);
src/nickalias.cpp
+2 -2
View File
@@ -139,9 +139,9 @@ NickAlias *NickAlias::Find(const Anope::string &nick)
return NULL;
}
NickAlias *NickAlias::FindId(uint64_t id)
NickAlias *NickAlias::FindId(uint64_t uid)
{
const auto *nc = NickCore::FindId(id);
const auto *nc = NickCore::FindId(uid);
return nc ? nc->na : nullptr;
}
src/nickcore.cpp
+6 -6
View File
@@ -32,8 +32,8 @@ NickCore::NickCore(const Anope::string &coredisplay, uint64_t coreid)
Log(LOG_DEBUG) << "Duplicate account " << this->display << " in NickCore table";
// Upgrading users may not have an account identifier.
if (this->id && !NickCoreIdList->insert_or_assign(this->id, this).second)
Log(LOG_DEBUG) << "Duplicate account id " << this->id << " in NickCore table";
if (this->uniqueid && !NickCoreIdList->insert_or_assign(this->uniqueid, this).second)
Log(LOG_DEBUG) << "Duplicate account id " << this->uniqueid << " in NickCore table";
FOREACH_MOD(OnNickCoreCreate, (this));
}
@@ -55,8 +55,8 @@ NickCore::~NickCore()
this->users.clear();
NickCoreList->erase(this->display);
if (this->id)
NickCoreIdList->erase(this->id);
if (this->uniqueid)
NickCoreIdList->erase(this->uniqueid);
if (!this->memos.memos->empty())
{
@@ -244,9 +244,9 @@ NickCore *NickCore::Find(const Anope::string &nick)
return NULL;
}
NickCore *NickCore::FindId(uint64_t id)
NickCore *NickCore::FindId(uint64_t uid)
{
auto it = NickCoreIdList->find(id);
auto it = NickCoreIdList->find(uid);
if (it != NickCoreIdList->end())
{
it->second->QueueUpdate();
src/regchannel.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ Serializable *AutoKick::Type::Unserialize(Serializable *obj, Serialize::Data &da
ak = anope_dynamic_static_cast<AutoKick *>(obj);
data["creator"] >> ak->creator;
data["reason"] >> ak->reason;
ak->nc = NickCore::Find(snc);
ak->nc = nc;
data["mask"] >> ak->mask;
data["addtime"] >> ak->addtime;
data["last_used"] >> ak->last_used;