summaryrefslogtreecommitdiff
path: root/modules/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'modules/rpc')
-rw-r--r--modules/rpc/jsonrpc.cpp12
-rw-r--r--modules/rpc/rpc_data.cpp20
-rw-r--r--modules/rpc/rpc_message.cpp6
-rw-r--r--modules/rpc/rpc_system.cpp4
4 files changed, 21 insertions, 21 deletions
diff --git a/modules/rpc/jsonrpc.cpp b/modules/rpc/jsonrpc.cpp
index 2e8753b8a..dfb6ce2e5 100644
--- a/modules/rpc/jsonrpc.cpp
+++ b/modules/rpc/jsonrpc.cpp
@@ -23,7 +23,7 @@ inline Anope::string yyjson_get_astr(yyjson_val *val, const char *key)
class JSONRPCServiceInterface final
: public RPC::ServiceInterface
- , public HTTPPage
+ , public HTTP::Page
{
private:
static std::pair<yyjson_mut_doc *, yyjson_mut_val *> CreateReply(const Anope::string &id)
@@ -43,7 +43,7 @@ private:
return { doc, root };
}
- static void SendError(HTTPReply &reply, int64_t code, const Anope::string &message, const Anope::string &id = "")
+ static void SendError(HTTP::Reply &reply, int64_t code, const Anope::string &message, const Anope::string &id = "")
{
Log(LOG_DEBUG) << "JSON-RPC error " << code << ": " << message;
@@ -91,11 +91,11 @@ public:
JSONRPCServiceInterface(Module *creator)
: RPC::ServiceInterface(creator)
- , HTTPPage("/jsonrpc", "application/json")
+ , HTTP::Page("/jsonrpc", "application/json")
{
}
- bool OnRequest(HTTPProvider *provider, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply) override
+ bool OnRequest(HTTP::Provider *provider, const Anope::string &page_name, HTTP::Client *client, HTTP::Message &message, HTTP::Reply &reply) override
{
yyjson_read_err error;
const auto flags = YYJSON_READ_ALLOW_TRAILING_COMMAS | YYJSON_READ_ALLOW_INVALID_UNICODE;
@@ -275,7 +275,7 @@ class ModuleJSONRPC final
: public Module
{
private:
- ServiceReference<HTTPProvider> httpref;
+ ServiceReference<HTTP::Provider> httpref;
JSONRPCServiceInterface jsonrpcinterface;
public:
@@ -299,7 +299,7 @@ public:
const auto &modconf = conf.GetModule(this);
JSONRPCServiceInterface::integer_bits = modconf.Get<unsigned>("integer_bits", "64");
- this->httpref = ServiceReference<HTTPProvider>("HTTPProvider", modconf.Get<const Anope::string>("server", "httpd/main"));
+ this->httpref = ServiceReference<HTTP::Provider>(HTTP_PROVIDER, modconf.Get<const Anope::string>("server", "httpd/main"));
if (!httpref)
throw ConfigException("Unable to find http reference, is httpd loaded?");
diff --git a/modules/rpc/rpc_data.cpp b/modules/rpc/rpc_data.cpp
index 13dec3cf2..bfc1fa565 100644
--- a/modules/rpc/rpc_data.cpp
+++ b/modules/rpc/rpc_data.cpp
@@ -139,7 +139,7 @@ public:
users.Reply(u->nick);
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
const auto detail = request.data.empty() ? "name" : request.data[0];
if (detail.equals_ci("name"))
@@ -171,7 +171,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
auto *na = NickAlias::Find(request.data[0]);
if (!na)
@@ -249,7 +249,7 @@ public:
users.Reply(uc->status.BuildModePrefixList() + uc->user->nick);
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
const auto detail = request.data.empty() ? "name" : request.data[0];
if (detail.equals_ci("name"))
@@ -281,7 +281,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
auto *c = Channel::Find(request.data[0]);
if (!c)
@@ -347,7 +347,7 @@ public:
root.Reply("vhost", o->vhost);
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
const auto detail = request.data.empty() ? "name" : request.data[0];
if (detail.equals_ci("name"))
@@ -379,7 +379,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
auto *o = Oper::Find(request.data[0]);
if (!o)
@@ -425,7 +425,7 @@ public:
root.Reply("uplink", nullptr);
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
const auto detail = request.data.empty() ? "name" : request.data[0];
if (detail.equals_ci("name"))
@@ -457,7 +457,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
auto *s = Server::Find(request.data[0]);
if (!s)
@@ -552,7 +552,7 @@ public:
root.Reply("vident", u->GetIdent());
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
const auto detail = request.data.empty() ? "name" : request.data[0];
if (detail.equals_ci("name"))
@@ -584,7 +584,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
auto *u = User::Find(request.data[0]);
if (!u)
diff --git a/modules/rpc/rpc_message.cpp b/modules/rpc/rpc_message.cpp
index 304f3f3ac..63de7d8e5 100644
--- a/modules/rpc/rpc_message.cpp
+++ b/modules/rpc/rpc_message.cpp
@@ -36,7 +36,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
if (!global)
{
@@ -63,7 +63,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
if (!global)
{
@@ -94,7 +94,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
auto *bi = BotInfo::Find(request.data[0], true);
if (!bi)
diff --git a/modules/rpc/rpc_system.cpp b/modules/rpc/rpc_system.cpp
index e20800268..cf8e9f4a5 100644
--- a/modules/rpc/rpc_system.cpp
+++ b/modules/rpc/rpc_system.cpp
@@ -27,7 +27,7 @@ public:
#endif
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
// For both the map type and array type we test that we can handle:
//
@@ -88,7 +88,7 @@ public:
{
}
- bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTP::Client *client, RPC::Request &request) override
{
auto &root = request.Root<RPC::Array>();
for (const auto &event : Service::GetServiceKeys(RPC_EVENT))
generated by cgit (git 2.34.1) at 2025-06-17 03:48:08 +0000