Mercurial > irccd
changeset 249:c2c40fc0beb1
Irccd: rename some functions
line wrap: on
line diff
--- a/irccd/main.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/irccd/main.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -234,15 +234,15 @@ // [transport] for (const auto &transport : config.loadTransports()) - instance->transportService().add(transport); + instance->transports().add(transport); // [server] section. for (const auto &server : config.loadServers()) - instance->serverService().add(server); + instance->servers().add(server); // [rule] section. for (const auto &rule : config.loadRules()) - instance->ruleService().add(rule); + instance->rules().add(rule); // [plugin] section. config.loadPlugins(*instance);
--- a/lib/irccd/cmd-plugin-config.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-plugin-config.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -31,7 +31,7 @@ nlohmann::json execSet(Irccd &irccd, const nlohmann::json &request, const std::string &var, const std::string &value) { - auto plugin = irccd.pluginService().require(request["plugin"].get<std::string>()); + auto plugin = irccd.plugins().require(request["plugin"].get<std::string>()); auto config = plugin->config(); config[var] = value; @@ -42,7 +42,7 @@ nlohmann::json execGet(Irccd &irccd, const nlohmann::json &request, const nlohmann::json::const_iterator &var) { - auto config = irccd.pluginService().require(request["plugin"].get<std::string>())->config(); + auto config = irccd.plugins().require(request["plugin"].get<std::string>())->config(); // 'vars' property. std::map<std::string, nlohmann::json> vars;
--- a/lib/irccd/cmd-plugin-info.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-plugin-info.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -52,7 +52,7 @@ { Command::exec(irccd, request); - auto plugin = irccd.pluginService().require(request.at("plugin").get<std::string>()); + auto plugin = irccd.plugins().require(request.at("plugin").get<std::string>()); return nlohmann::json::object({ { "author", plugin->author() },
--- a/lib/irccd/cmd-plugin-list.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-plugin-list.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -38,7 +38,7 @@ auto response = Command::exec(irccd, request); auto list = nlohmann::json::array(); - for (const auto &plugin : irccd.pluginService().plugins()) + for (const auto &plugin : irccd.plugins().list()) list += plugin->name(); response.push_back({"list", std::move(list)});
--- a/lib/irccd/cmd-plugin-load.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-plugin-load.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -44,7 +44,7 @@ { Command::exec(irccd, request); - irccd.pluginService().load(request["plugin"]); + irccd.plugins().load(request["plugin"]); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-plugin-reload.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-plugin-reload.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -45,7 +45,7 @@ { Command::exec(irccd, request); - irccd.pluginService().require(request["plugin"])->onReload(irccd); + irccd.plugins().require(request["plugin"])->onReload(irccd); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-plugin-unload.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-plugin-unload.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -44,7 +44,7 @@ { Command::exec(irccd, request); - irccd.pluginService().unload(request["plugin"].get<std::string>()); + irccd.plugins().unload(request["plugin"].get<std::string>()); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-server-cmode.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-cmode.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -52,7 +52,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"].get<std::string>())->cmode( + irccd.servers().require(request["server"].get<std::string>())->cmode( request["channel"].get<std::string>(), request["mode"].get<std::string>() );
--- a/lib/irccd/cmd-server-cnotice.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-cnotice.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -52,7 +52,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"].get<std::string>())->cnotice( + irccd.servers().require(request["server"].get<std::string>())->cnotice( request["channel"].get<std::string>(), request["message"].get<std::string>() );
--- a/lib/irccd/cmd-server-connect.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-connect.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -72,10 +72,10 @@ { auto server = Server::fromJson(request); - if (irccd.serverService().has(server->name())) + if (irccd.servers().has(server->name())) throw std::invalid_argument("server '{}' already exists"_format(server->name())); - irccd.serverService().add(std::move(server)); + irccd.servers().add(std::move(server)); return Command::exec(irccd, request); }
--- a/lib/irccd/cmd-server-disconnect.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-disconnect.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -40,9 +40,9 @@ auto it = request.find("server"); if (it == request.end()) - irccd.serverService().clear(); + irccd.servers().clear(); else - irccd.serverService().remove(*it); + irccd.servers().remove(*it); return Command::exec(irccd, request); }
--- a/lib/irccd/cmd-server-info.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-info.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -50,7 +50,7 @@ nlohmann::json ServerInfo::exec(Irccd &irccd, const nlohmann::json &request) const { auto response = Command::exec(irccd, request); - auto server = irccd.serverService().require(request["server"]); + auto server = irccd.servers().require(request["server"]); // General stuff. response.push_back({"name", server->name()});
--- a/lib/irccd/cmd-server-invite.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-invite.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -61,7 +61,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"])->invite(request["target"], request["channel"]); + irccd.servers().require(request["server"])->invite(request["target"], request["channel"]); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-server-join.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-join.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -69,7 +69,7 @@ if (request.find("password") != request.end()) password = request["password"]; - irccd.serverService().require( + irccd.servers().require( request.at("server").get<std::string>())->join( request.at("channel").get<std::string>(), password
--- a/lib/irccd/cmd-server-kick.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-kick.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -67,7 +67,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"])->kick( + irccd.servers().require(request["server"])->kick( request["target"], request["channel"], request.count("reason") > 0 ? request["reason"] : ""
--- a/lib/irccd/cmd-server-list.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-list.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -37,7 +37,7 @@ auto json = nlohmann::json::object(); auto list = nlohmann::json::array(); - for (const auto &server : irccd.serverService().servers()) + for (const auto &server : irccd.servers().servers()) list.push_back(server->name()); json.push_back({"list", std::move(list)});
--- a/lib/irccd/cmd-server-me.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-me.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -61,7 +61,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"])->me(request["target"], request["message"]); + irccd.servers().require(request["server"])->me(request["target"], request["message"]); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-server-message.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-message.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -61,7 +61,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"])->me(request["target"], request["message"]); + irccd.servers().require(request["server"])->me(request["target"], request["message"]); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-server-mode.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-mode.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -58,7 +58,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"])->mode(request["mode"]); + irccd.servers().require(request["server"])->mode(request["mode"]); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-server-nick.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-nick.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -58,7 +58,7 @@ { Command::exec(irccd, object); - irccd.serverService().require(object["server"])->setNickname(object["nickname"]); + irccd.servers().require(object["server"])->setNickname(object["nickname"]); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-server-notice.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-notice.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -61,7 +61,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"])->notice(request["target"], request["message"]); + irccd.servers().require(request["server"])->notice(request["target"], request["message"]); return nlohmann::json::object(); }
--- a/lib/irccd/cmd-server-part.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-part.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -64,7 +64,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"])->part( + irccd.servers().require(request["server"])->part( request["channel"], request.count("reason") > 0 ? request["reason"] : "" );
--- a/lib/irccd/cmd-server-reconnect.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-reconnect.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -45,9 +45,9 @@ auto server = request.find("server"); if (server != request.end() && server->is_string()) - irccd.serverService().require(*server)->reconnect(); + irccd.servers().require(*server)->reconnect(); else - for (auto &server : irccd.serverService().servers()) + for (auto &server : irccd.servers().servers()) server->reconnect(); return nullptr;
--- a/lib/irccd/cmd-server-topic.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/cmd-server-topic.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -61,7 +61,7 @@ { Command::exec(irccd, request); - irccd.serverService().require(request["server"])->topic(request["channel"], request["topic"]); + irccd.servers().require(request["server"])->topic(request["channel"], request["topic"]); return nlohmann::json::object(); }
--- a/lib/irccd/config.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/config.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -558,9 +558,9 @@ if (!util::isIdentifierValid(option.key())) continue; - irccd.pluginService().setConfig(option.key(), findPluginConfig(option.key())); - irccd.pluginService().setFormats(option.key(), findPluginFormats(option.key())); - irccd.pluginService().load(option.key(), option.value()); + irccd.plugins().setConfig(option.key(), findPluginConfig(option.key())); + irccd.plugins().setFormats(option.key(), findPluginFormats(option.key())); + irccd.plugins().load(option.key(), option.value()); } } }
--- a/lib/irccd/irccd.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/irccd.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -36,15 +36,15 @@ Irccd::Irccd() : m_commandService(std::make_shared<CommandService>()) , m_interruptService(std::make_shared<InterruptService>()) - , m_serverService(std::make_shared<ServerService>(*this)) - , m_transportService(std::make_shared<TransportService>(*this)) + , m_servers(std::make_shared<ServerService>(*this)) + , m_transports(std::make_shared<TransportService>(*this)) , m_ruleService(std::make_shared<RuleService>()) , m_moduleService(std::make_shared<ModuleService>()) - , m_pluginService(std::make_shared<PluginService>(*this)) + , m_plugins(std::make_shared<PluginService>(*this)) { m_services.push_back(m_interruptService); - m_services.push_back(m_serverService); - m_services.push_back(m_transportService); + m_services.push_back(m_servers); + m_services.push_back(m_transports); } void Irccd::post(std::function<void (Irccd &)> ev) noexcept
--- a/lib/irccd/irccd.hpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/irccd.hpp Wed Aug 17 23:00:59 2016 +0200 @@ -60,11 +60,11 @@ // Services. std::shared_ptr<CommandService> m_commandService; std::shared_ptr<InterruptService> m_interruptService; - std::shared_ptr<ServerService> m_serverService; - std::shared_ptr<TransportService> m_transportService; + std::shared_ptr<ServerService> m_servers; + std::shared_ptr<TransportService> m_transports; std::shared_ptr<RuleService> m_ruleService; std::shared_ptr<ModuleService> m_moduleService; - std::shared_ptr<PluginService> m_pluginService; + std::shared_ptr<PluginService> m_plugins; std::vector<std::shared_ptr<Pollable>> m_services; // Not copyable and not movable because services has references to irccd. @@ -95,7 +95,7 @@ * * \return the service */ - inline CommandService &commandService() noexcept + inline CommandService &commands() noexcept { return *m_commandService; } @@ -105,9 +105,9 @@ * * \return the service */ - inline ServerService &serverService() noexcept + inline ServerService &servers() noexcept { - return *m_serverService; + return *m_servers; } /** @@ -115,9 +115,9 @@ * * \return the service */ - inline TransportService &transportService() noexcept + inline TransportService &transports() noexcept { - return *m_transportService; + return *m_transports; } /** @@ -125,7 +125,7 @@ * * \return the service */ - inline RuleService &ruleService() noexcept + inline RuleService &rules() noexcept { return *m_ruleService; } @@ -135,7 +135,7 @@ * * \return the service */ - inline ModuleService &moduleService() noexcept + inline ModuleService &modules() noexcept { return *m_moduleService; } @@ -145,9 +145,9 @@ * * \return the service */ - inline PluginService &pluginService() noexcept + inline PluginService &plugins() noexcept { - return *m_pluginService; + return *m_plugins; } /**
--- a/lib/irccd/mod-plugin.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/mod-plugin.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -190,7 +190,7 @@ std::shared_ptr<Plugin> plugin; if (duk_get_top(ctx) >= 1) - plugin = dukx_get_irccd(ctx).pluginService().get(duk_require_string(ctx, 0)); + plugin = dukx_get_irccd(ctx).plugins().get(duk_require_string(ctx, 0)); else plugin = dukx_get_plugin(ctx); @@ -223,7 +223,7 @@ */ duk_idx_t list(duk_context *ctx) { - dukx_push_array(ctx, dukx_get_irccd(ctx).pluginService().plugins(), [] (auto ctx, auto plugin) { + dukx_push_array(ctx, dukx_get_irccd(ctx).plugins().list(), [] (auto ctx, auto plugin) { dukx_push_std_string(ctx, plugin->name()); }); @@ -246,7 +246,7 @@ duk_idx_t load(duk_context *ctx) { return wrap(ctx, 0, [&] (Irccd &irccd, const std::string &name) { - irccd.pluginService().load(name); + irccd.plugins().load(name); }); } @@ -265,7 +265,7 @@ duk_idx_t reload(duk_context *ctx) { return wrap(ctx, 0, [&] (Irccd &irccd, const std::string &name) { - irccd.pluginService().reload(name); + irccd.plugins().reload(name); }); } @@ -284,7 +284,7 @@ duk_idx_t unload(duk_context *ctx) { return wrap(ctx, 0, [&] (Irccd &irccd, const std::string &name) { - irccd.pluginService().unload(name); + irccd.plugins().unload(name); }); }
--- a/lib/irccd/mod-server.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/mod-server.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -431,7 +431,7 @@ */ duk_ret_t add(duk_context *ctx) { - dukx_get_irccd(ctx).serverService().add(dukx_require_server(ctx, 0)); + dukx_get_irccd(ctx).servers().add(dukx_require_server(ctx, 0)); return 0; } @@ -449,7 +449,7 @@ */ duk_ret_t find(duk_context *ctx) { - auto server = dukx_get_irccd(ctx).serverService().get(duk_require_string(ctx, 0)); + auto server = dukx_get_irccd(ctx).servers().get(duk_require_string(ctx, 0)); if (!server) return 0; @@ -472,7 +472,7 @@ { duk_push_object(ctx); - for (const auto &server : dukx_get_irccd(ctx).serverService().servers()) { + for (const auto &server : dukx_get_irccd(ctx).servers().servers()) { dukx_push_server(ctx, server); duk_put_prop_string(ctx, -2, server->name().c_str()); } @@ -492,7 +492,7 @@ */ duk_ret_t remove(duk_context *ctx) { - dukx_get_irccd(ctx).serverService().remove(duk_require_string(ctx, 0)); + dukx_get_irccd(ctx).servers().remove(duk_require_string(ctx, 0)); return 0; }
--- a/lib/irccd/plugin-js.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/plugin-js.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -87,9 +87,9 @@ void JsPlugin::putModules(Irccd &irccd) { - m_modules = irccd.moduleService().modules(); + m_modules = irccd.modules().list(); - for (const auto &module : irccd.moduleService().modules()) + for (const auto &module : irccd.modules().list()) module->load(irccd, std::static_pointer_cast<JsPlugin>(shared_from_this())); } @@ -261,8 +261,8 @@ * calling onLoad to allow the plugin adding configuration to * Irccd.Plugin.(config|format) before the user. */ - setConfig(irccd.pluginService().config(name())); - setFormats(irccd.pluginService().formats(name())); + setConfig(irccd.plugins().config(name())); + setFormats(irccd.plugins().formats(name())); // Read metadata . duk_get_global_string(m_context, "info");
--- a/lib/irccd/service-module.hpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/service-module.hpp Wed Aug 17 23:00:59 2016 +0200 @@ -52,7 +52,7 @@ * * \return the modules */ - inline const std::vector<std::shared_ptr<Module>> &modules() const noexcept + inline const std::vector<std::shared_ptr<Module>> &list() const noexcept { return m_modules; }
--- a/lib/irccd/service-plugin.hpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/service-plugin.hpp Wed Aug 17 23:00:59 2016 +0200 @@ -63,7 +63,7 @@ * * \return the list of plugins */ - inline const std::vector<std::shared_ptr<Plugin>> &plugins() const noexcept + inline const std::vector<std::shared_ptr<Plugin>> &list() const noexcept { return m_plugins; }
--- a/lib/irccd/service-rule.hpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/service-rule.hpp Wed Aug 17 23:00:59 2016 +0200 @@ -44,7 +44,7 @@ * * \return the list of rules */ - inline const std::vector<Rule> &rules() const noexcept + inline const std::vector<Rule> &list() const noexcept { return m_rules; }
--- a/lib/irccd/service-server.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/service-server.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -46,9 +46,9 @@ void operator()(Irccd &irccd) const { - for (auto &plugin : irccd.pluginService().plugins()) { + for (auto &plugin : irccd.plugins().list()) { auto eventname = functionName(*plugin); - auto allowed = irccd.ruleService().solve(server, target, origin, plugin->name(), eventname); + auto allowed = irccd.rules().solve(server, target, origin, plugin->name(), eventname); if (!allowed) { log::debug() << "rule: event skipped on match" << std::endl; @@ -82,7 +82,7 @@ log::debug() << " mode: " << ev.mode << "\n"; log::debug() << " argument: " << ev.argument << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onChannelMode" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -108,7 +108,7 @@ log::debug() << " channel: " << ev.channel << "\n"; log::debug() << " message: " << ev.message << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onChannelNotice" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -130,7 +130,7 @@ { log::debug() << "server " << ev.server->name() << ": event onConnect" << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onConnect" }, { "server", ev.server->name() } })); @@ -152,7 +152,7 @@ log::debug() << " channel: " << ev.channel << "\n"; log::debug() << " target: " << ev.nickname << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onInvite" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -175,7 +175,7 @@ log::debug() << " origin: " << ev.origin << "\n"; log::debug() << " channel: " << ev.channel << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onJoin" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -200,7 +200,7 @@ log::debug() << " target: " << ev.target << "\n"; log::debug() << " reason: " << ev.reason << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onKick" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -226,7 +226,7 @@ log::debug() << " channel: " << ev.channel << "\n"; log::debug() << " message: " << ev.message << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onMessage" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -259,7 +259,7 @@ log::debug() << " target: " << ev.channel << "\n"; log::debug() << " message: " << ev.message << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onMe" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -283,7 +283,7 @@ log::debug() << " origin: " << ev.origin << "\n"; log::debug() << " mode: " << ev.mode << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onMode" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -311,7 +311,7 @@ for (const auto &v : ev.names) names.push_back(v); - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onNames" }, { "server", ev.server->name() }, { "channel", ev.channel }, @@ -334,7 +334,7 @@ log::debug() << " origin: " << ev.origin << "\n"; log::debug() << " nickname: " << ev.nickname << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onNick" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -357,7 +357,7 @@ log::debug() << " origin: " << ev.origin << "\n"; log::debug() << " message: " << ev.message << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onNotice" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -381,7 +381,7 @@ log::debug() << " channel: " << ev.channel << "\n"; log::debug() << " reason: " << ev.reason << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onPart" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -405,7 +405,7 @@ log::debug() << " origin: " << ev.origin << "\n"; log::debug() << " message: " << ev.message << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onQuery" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -437,7 +437,7 @@ log::debug() << " channel: " << ev.channel << "\n"; log::debug() << " topic: " << ev.topic << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onTopic" }, { "server", ev.server->name() }, { "origin", ev.origin }, @@ -464,7 +464,7 @@ log::debug() << " realname: " << ev.whois.realname << "\n"; log::debug() << " channels: " << util::join(ev.whois.channels.begin(), ev.whois.channels.end()) << std::endl; - m_irccd.transportService().broadcast(nlohmann::json::object({ + m_irccd.transports().broadcast(nlohmann::json::object({ { "event", "onWhois" }, { "server", ev.server->name() }, { "nickname", ev.whois.nick },
--- a/lib/irccd/service-transport.cpp Wed Aug 17 22:03:43 2016 +0200 +++ b/lib/irccd/service-transport.cpp Wed Aug 17 23:00:59 2016 +0200 @@ -46,7 +46,7 @@ } // 2. Search for a command - auto cmd = m_irccd.commandService().find(*name); + auto cmd = m_irccd.commands().find(*name); if (!cmd) { // TODO: send error again.