From ff7c1adf1b2290b2228e6f35c6b0cd46a7cf245d Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 14 Apr 2021 23:11:53 +0100 Subject: Remove some useless getter methods and make the members public. This isn't part of a public API so we don't need to care about exposing implementation details. --- src/modules/m_spanningtree/main.cpp | 2 +- src/modules/m_spanningtree/main.h | 20 +++----------------- src/modules/m_spanningtree/misccommands.cpp | 4 ++-- src/modules/m_spanningtree/netburst.cpp | 6 +++--- src/modules/m_spanningtree/treeserver.cpp | 6 +++--- src/modules/m_spanningtree/utils.cpp | 2 +- 6 files changed, 13 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 13753ea73..b59b74099 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -707,7 +707,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod) for (const auto& [_, server] : Utils->serverlist) { if (!server->IsRoot()) - GetLinkEventProvider().Call(&ServerProtocol::LinkEventListener::OnServerSplit, server, false); + linkeventprov.Call(&ServerProtocol::LinkEventListener::OnServerSplit, server, false); } return; } diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index af454b06b..4e3227307 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -90,6 +90,7 @@ class ModuleSpanningTree */ Membership::Id currmembid = 0; + public: /** The specialized ProtocolInterface that is assigned to ServerInstance->PI on load */ SpanningTreeProtocolInterface protocolinterface; @@ -115,12 +116,13 @@ class ModuleSpanningTree /** Tag for marking services pseudoclients. */ ServiceTag servicetag; - public: + /** The DNS manager service provided by core_dns. */ dynamic_reference DNS; /** Event provider for message tags. */ ClientProtocol::MessageTagEvent tagevprov; + /** Manager for server commands. */ ServerCommandManager CmdManager; /** Set to true if inside a spanningtree call, to prevent sending @@ -173,22 +175,6 @@ class ModuleSpanningTree */ ModResult HandleConnect(const CommandBase::Params& parameters, User* user); - /** Retrieves the event provider for broadcast events. */ - const Events::ModuleEventProvider& GetBroadcastEventProvider() const { return broadcasteventprov; } - - /** Retrieves the event provider for link events. */ - const Events::ModuleEventProvider& GetLinkEventProvider() const { return linkeventprov; } - - /** Retrieves the event provider for message events. */ - const Events::ModuleEventProvider& GetMessageEventProvider() const { return messageeventprov; } - - /** Retrieves the event provider for sync events. */ - const Events::ModuleEventProvider& GetSyncEventProvider() const { return synceventprov; } - - /** - ** *** MODULE EVENTS *** - **/ - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override; void OnPostCommand(Command*, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop) override; void OnUserConnect(LocalUser* source) override; diff --git a/src/modules/m_spanningtree/misccommands.cpp b/src/modules/m_spanningtree/misccommands.cpp index a0057e13f..41652789e 100644 --- a/src/modules/m_spanningtree/misccommands.cpp +++ b/src/modules/m_spanningtree/misccommands.cpp @@ -29,7 +29,7 @@ void CmdBuilder::FireEvent(Server* target, const char* cmd, ClientProtocol::TagM if (!Utils->Creator || Utils->Creator->dying) return; - Utils->Creator->GetMessageEventProvider().Call(&ServerProtocol::MessageEventListener::OnBuildServerMessage, target, cmd, taglist); + Utils->Creator->messageeventprov.Call(&ServerProtocol::MessageEventListener::OnBuildServerMessage, target, cmd, taglist); UpdateTags(); } @@ -38,7 +38,7 @@ void CmdBuilder::FireEvent(User* target, const char* cmd, ClientProtocol::TagMap if (!Utils->Creator || Utils->Creator->dying) return; - Utils->Creator->GetMessageEventProvider().Call(&ServerProtocol::MessageEventListener::OnBuildUserMessage, target, cmd, taglist); + Utils->Creator->messageeventprov.Call(&ServerProtocol::MessageEventListener::OnBuildUserMessage, target, cmd, taglist); UpdateTags(); } diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp index f31118910..a72f5f6ce 100644 --- a/src/modules/m_spanningtree/netburst.cpp +++ b/src/modules/m_spanningtree/netburst.cpp @@ -117,7 +117,7 @@ void TreeSocket::DoBurst(TreeServer* s) // Send all xlines this->SendXLines(); - Utils->Creator->GetSyncEventProvider().Call(&ServerProtocol::SyncEventListener::OnSyncNetwork, bs.server); + Utils->Creator->synceventprov.Call(&ServerProtocol::SyncEventListener::OnSyncNetwork, bs.server); this->WriteLine(CmdBuilder("ENDBURST")); ServerInstance->SNO.WriteToSnoMask('l',"Finished bursting to \002"+ s->GetName()+"\002."); } @@ -258,7 +258,7 @@ void TreeSocket::SyncChannel(Channel* chan, BurstState& bs) } } - Utils->Creator->GetSyncEventProvider().Call(&ServerProtocol::SyncEventListener::OnSyncChannel, chan, bs.server); + Utils->Creator->synceventprov.Call(&ServerProtocol::SyncEventListener::OnSyncChannel, chan, bs.server); } void TreeSocket::SyncChannel(Channel* chan) @@ -290,6 +290,6 @@ void TreeSocket::SendUsers(BurstState& bs) this->WriteLine(CommandMetadata::Builder(user, item->name, value)); } - Utils->Creator->GetSyncEventProvider().Call(&ServerProtocol::SyncEventListener::OnSyncUser, user, bs.server); + Utils->Creator->synceventprov.Call(&ServerProtocol::SyncEventListener::OnSyncUser, user, bs.server); } } diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index e2a9d1d9d..f0e85828c 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -126,7 +126,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s this->AddHashEntry(); Parent->Children.push_back(this); - Utils->Creator->GetLinkEventProvider().Call(&ServerProtocol::LinkEventListener::OnServerLink, this); + Utils->Creator->linkeventprov.Call(&ServerProtocol::LinkEventListener::OnServerLink, this); } void TreeServer::BeginBurst(uint64_t startms) @@ -160,7 +160,7 @@ void TreeServer::FinishBurst() unsigned long bursttime = ts - this->StartBurst; ServerInstance->SNO.WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \002%s\002 (burst time: %lu %s)", GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs")); - Utils->Creator->GetLinkEventProvider().Call(&ServerProtocol::LinkEventListener::OnServerBurst, this); + Utils->Creator->linkeventprov.Call(&ServerProtocol::LinkEventListener::OnServerBurst, this); StartBurst = 0; FinishBurstInternal(); @@ -211,7 +211,7 @@ void TreeServer::SQuitInternal(unsigned int& num_lost_servers, bool error) RemoveHash(); if (!Utils->Creator->dying) - Utils->Creator->GetLinkEventProvider().Call(&ServerProtocol::LinkEventListener::OnServerSplit, this, error); + Utils->Creator->linkeventprov.Call(&ServerProtocol::LinkEventListener::OnServerSplit, this, error); } unsigned int TreeServer::QuitUsers(const std::string& reason) diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 2bae42dca..36eb1c51e 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -168,7 +168,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet // is used to keep the chanhistory module synchronised between servers. for (const auto& child : children) { - ModResult result = Creator->GetBroadcastEventProvider().FirstResult(&ServerProtocol::BroadcastEventListener::OnBroadcastMessage, c, child); + ModResult result = Creator->broadcasteventprov.FirstResult(&ServerProtocol::BroadcastEventListener::OnBroadcastMessage, c, child); if (result == MOD_RES_ALLOW) list.insert(child->GetSocket()); } -- cgit v1.3.1-10-gc9f91