aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Sadie Powell2023-05-30 02:38:25 +0100
committerGravatar Sadie Powell2023-05-30 02:38:25 +0100
commitea85c0c6bad664e241e9d407e8ae10c7971a66c2 (patch)
treee3ce7b3a0b90e39959a14fdabaa4a58ce61d688e /src
parentMerge branch 'insp3' into master. (diff)
Fix casing of metadata in function and event names.
Metadata is one word not two so it shouldn't be capitalised like this.
Diffstat (limited to 'src')
-rw-r--r--src/extensible.cpp2
-rw-r--r--src/modules.cpp2
-rw-r--r--src/modules/m_filter.cpp6
-rw-r--r--src/modules/m_sasl.cpp2
-rw-r--r--src/modules/m_spanningtree/main.cpp6
-rw-r--r--src/modules/m_spanningtree/main.h2
-rw-r--r--src/modules/m_spanningtree/metadata.cpp8
-rw-r--r--src/modules/m_spanningtree/protocolinterface.cpp6
-rw-r--r--src/modules/m_spanningtree/protocolinterface.h6
-rw-r--r--src/modules/m_swhois.cpp2
10 files changed, 21 insertions, 21 deletions
diff --git a/src/extensible.cpp b/src/extensible.cpp
index dbecdd209..c6799bba2 100644
--- a/src/extensible.cpp
+++ b/src/extensible.cpp
@@ -137,7 +137,7 @@ void ExtensionItem::Sync(const Extensible* container, void* item)
{
const std::string networkstr = ToNetwork(container, item);
if (!networkstr.empty())
- ServerInstance->PI->SendMetaData(container, name, networkstr);
+ ServerInstance->PI->SendMetadata(container, name, networkstr);
}
void ExtensionItem::FromInternal(Extensible* container, const std::string& value) noexcept
diff --git a/src/modules.cpp b/src/modules.cpp
index d3d6dc18d..603210ce6 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -138,7 +138,7 @@ void Module::OnUserPostMessage(User*, const MessageTarget&, const MessageDetail
void Module::OnUserMessageBlocked(User*, const MessageTarget&, const MessageDetails&) { DetachEvent(I_OnUserMessageBlocked); }
void Module::OnUserInvite(User*, User*, Channel*, time_t, ModeHandler::Rank, CUList&) { DetachEvent(I_OnUserInvite); }
void Module::OnPostTopicChange(User*, Channel*, const std::string&) { DetachEvent(I_OnPostTopicChange); }
-void Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { DetachEvent(I_OnDecodeMetaData); }
+void Module::OnDecodeMetadata(Extensible*, const std::string&, const std::string&) { DetachEvent(I_OnDecodeMetadata); }
void Module::OnChangeHost(User*, const std::string&) { DetachEvent(I_OnChangeHost); }
void Module::OnChangeRealHost(User*, const std::string&) { DetachEvent(I_OnChangeRealHost); }
void Module::OnPostChangeRealHost(User*) { DetachEvent(I_OnPostChangeRealHost); }
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 658fd14de..d239b3167 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -233,7 +233,7 @@ public:
static std::string EncodeFilter(const FilterResult& filter);
FilterResult DecodeFilter(const std::string& data);
void OnSyncNetwork(ProtocolInterface::Server& server) override;
- void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata) override;
+ void OnDecodeMetadata(Extensible* target, const std::string& extname, const std::string& extdata) override;
ModResult OnStats(Stats::Context& stats) override;
ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override;
void OnUnloadModule(Module* mod) override;
@@ -734,11 +734,11 @@ void ModuleFilter::OnSyncNetwork(ProtocolInterface::Server& server)
if (filter.from_config)
continue;
- server.SendMetaData("filter", EncodeFilter(filter));
+ server.SendMetadata("filter", EncodeFilter(filter));
}
}
-void ModuleFilter::OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata)
+void ModuleFilter::OnDecodeMetadata(Extensible* target, const std::string& extname, const std::string& extdata)
{
if (!target && irc::equals(extname, "filter"))
{
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 2ecd38640..ac2b4dd4e 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -455,7 +455,7 @@ public:
}
}
- void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata) override
+ void OnDecodeMetadata(Extensible* target, const std::string& extname, const std::string& extdata) override
{
if (!target && irc::equals(extname, "saslmechlist"))
cap.SetMechlist(extdata);
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 12f083c69..4ec4b5c79 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -517,7 +517,7 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
{
const std::string value = item->ToNetwork(user, obj);
if (!value.empty())
- ServerInstance->PI->SendMetaData(user, item->name, value);
+ ServerInstance->PI->SendMetadata(user, item->name, value);
}
Utils->TreeRoot->UserCount++;
@@ -603,7 +603,7 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string& reason, const
if (IS_LOCAL(user))
{
if (oper_message != reason)
- ServerInstance->PI->SendMetaData(user, "operquit", oper_message);
+ ServerInstance->PI->SendMetadata(user, "operquit", oper_message);
CmdBuilder(user, "QUIT").push_last(reason).Broadcast();
}
@@ -858,7 +858,7 @@ void ModuleSpanningTree::OnShutdown(const std::string& reason)
children.front()->SQuit(reason, true);
}
-void ModuleSpanningTree::OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata)
+void ModuleSpanningTree::OnDecodeMetadata(Extensible* target, const std::string& extname, const std::string& extdata)
{
// HACK: this should use automatically synced user metadata in v4.
if (target && target->extype == ExtensionType::USER && irc::equals(extname, "uniqueusername"))
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index dcf09e629..bfdd14b1c 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -207,7 +207,7 @@ public:
ModResult OnAcceptConnection(int newsock, ListenSocket* from, const irc::sockets::sockaddrs& client, const irc::sockets::sockaddrs& server) override;
void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) override;
void OnShutdown(const std::string& reason) override;
- void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata) override;
+ void OnDecodeMetadata(Extensible* target, const std::string& extname, const std::string& extdata) override;
Cullable::Result Cull() override;
~ModuleSpanningTree() override;
void Prioritize() override;
diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index df51148cd..a37e526d7 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -33,7 +33,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
if (params[0] == "*")
{
std::string value = params.size() < 3 ? "" : params[2];
- FOREACH_MOD(OnDecodeMetaData, (nullptr, params[1], value));
+ FOREACH_MOD(OnDecodeMetadata, (nullptr, params[1], value));
return CmdResult::SUCCESS;
}
@@ -69,7 +69,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
const std::string value = params.size() < 7 ? "" : params[6];
if (item && item->extype == ExtensionType::MEMBERSHIP)
item->FromNetwork(m, value);
- FOREACH_MOD(OnDecodeMetaData, (m, params[5], value));
+ FOREACH_MOD(OnDecodeMetadata, (m, params[5], value));
}
if (ServerInstance->Channels.IsPrefix(params[0][0]))
@@ -93,7 +93,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
ExtensionItem* item = ServerInstance->Extensions.GetItem(params[2]);
if (item && item->extype == ExtensionType::CHANNEL)
item->FromNetwork(c, value);
- FOREACH_MOD(OnDecodeMetaData, (c, params[2], value));
+ FOREACH_MOD(OnDecodeMetadata, (c, params[2], value));
}
else
{
@@ -105,7 +105,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
if (item && item->extype == ExtensionType::USER)
item->FromNetwork(u, value);
- FOREACH_MOD(OnDecodeMetaData, (u, params[1], value));
+ FOREACH_MOD(OnDecodeMetadata, (u, params[1], value));
}
}
diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index efd47b70e..14e66660f 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -87,17 +87,17 @@ void SpanningTreeProtocolInterface::BroadcastEncap(const std::string& cmd, const
CmdBuilder(source, "ENCAP * ").push_raw(cmd).insert(params).Forward(server);
}
-void SpanningTreeProtocolInterface::SendMetaData(const Extensible* ext, const std::string& key, const std::string& data)
+void SpanningTreeProtocolInterface::SendMetadata(const Extensible* ext, const std::string& key, const std::string& data)
{
CommandMetadata::Builder(ext, key, data).Broadcast();
}
-void SpanningTreeProtocolInterface::SendMetaData(const std::string& key, const std::string& data)
+void SpanningTreeProtocolInterface::SendMetadata(const std::string& key, const std::string& data)
{
CommandMetadata::Builder(key, data).Broadcast();
}
-void SpanningTreeProtocolInterface::Server::SendMetaData(const std::string& key, const std::string& data)
+void SpanningTreeProtocolInterface::Server::SendMetadata(const std::string& key, const std::string& data)
{
sock->WriteLine(CommandMetadata::Builder(key, data));
}
diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h
index fc55c2743..ddba4e7e1 100644
--- a/src/modules/m_spanningtree/protocolinterface.h
+++ b/src/modules/m_spanningtree/protocolinterface.h
@@ -37,13 +37,13 @@ public:
: sock(s)
{
}
- void SendMetaData(const std::string& key, const std::string& data) override;
+ void SendMetadata(const std::string& key, const std::string& data) override;
};
bool SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const CommandBase::Params& params, const User* source) override;
void BroadcastEncap(const std::string& cmd, const CommandBase::Params& params, const User* source, const User* omit) override;
- void SendMetaData(const Extensible* ext, const std::string& key, const std::string& data) override;
- void SendMetaData(const std::string& key, const std::string& data) override;
+ void SendMetadata(const Extensible* ext, const std::string& key, const std::string& data) override;
+ void SendMetadata(const std::string& key, const std::string& data) override;
void SendSNONotice(char snomask, const std::string& text) override;
void SendMessage(const Channel* target, char status, const std::string& text, MessageType msgtype) override;
void SendMessage(const User* target, const std::string& text, MessageType msgtype) override;
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 52524ea7d..668761bf2 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -143,7 +143,7 @@ public:
cmd.swhois.Unset(user);
}
- void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string&) override
+ void OnDecodeMetadata(Extensible* target, const std::string& extname, const std::string&) override
{
if (target && target->extype == ExtensionType::USER && irc::equals(extname, "swhois"))
cmd.operblock.Unset(static_cast<User*>(target));