Refactor RPC

src/area/rpc.rs

@@ -14,27 +14,6 @@ use time::format_description::well_known::Rfc3339;
 use time::OffsetDateTime;
 use tracing::info;
 
-#[derive(Deserialize)]
-pub struct GetArgs {
-    pub token: String,
-    pub id: String,
-}
-
-pub async fn get(Params(args): Params<GetArgs>, pool: Data<Arc<Pool>>) -> Result<Area, Error> {
-    pool.get()
-        .await?
-        .interact(move |conn| Token::select_by_secret(&args.token, conn))
-        .await??
-        .unwrap();
-    let area = pool
-        .get()
-        .await?
-        .interact(move |conn| Area::select_by_id_or_alias(&args.id, conn))
-        .await??
-        .unwrap();
-    Ok(area)
-}
-
 #[derive(Deserialize)]
 pub struct SetTagArgs {
     pub token: String,

src/rpc/add_area.rs

@@ -1,4 +1,5 @@
-use crate::{area, discord, Error};
+use crate::Result;
+use crate::{area, discord};
 use crate::{area::Area, auth::Token};
 use deadpool_sqlite::Pool;
 use jsonrpc_v2::{Data, Params};
@@ -13,7 +14,7 @@ pub struct Args {
     pub tags: Map<String, Value>,
 }
 
-pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Area, Error> {
+pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Area> {
     let token = pool
         .get()
         .await?

src/rpc/get_area.rs

@@ -0,0 +1,26 @@
+use crate::{area::Area, auth::Token, Result};
+use deadpool_sqlite::Pool;
+use jsonrpc_v2::{Data, Params};
+use serde::Deserialize;
+use std::sync::Arc;
+
+#[derive(Deserialize)]
+pub struct Args {
+    pub token: String,
+    pub id: String,
+}
+
+pub async fn run(Params(args): Params<Args>, pool: Data<Arc<Pool>>) -> Result<Area> {
+    pool.get()
+        .await?
+        .interact(move |conn| Token::select_by_secret(&args.token, conn))
+        .await??
+        .unwrap();
+    let area = pool
+        .get()
+        .await?
+        .interact(move |conn| Area::select_by_id_or_alias(&args.id, conn))
+        .await??
+        .unwrap();
+    Ok(area)
+}

src/rpc/mod.rs

@@ -2,3 +2,4 @@ pub mod add_area;
 pub mod add_element_comment;
 pub mod boost_element;
 pub mod generate_element_issues;
+pub mod get_area;

src/server/mod.rs

@@ -88,7 +88,7 @@ pub async fn run() -> Result<()> {
                         .with_method("addelementcomment", rpc::add_element_comment::run)
                         .with_method("generateelementissues", rpc::generate_element_issues::run)
                         .with_method("addarea", rpc::add_area::run)
-                        .with_method("getarea", area::rpc::get)
+                        .with_method("getarea", rpc::get_area::run)
                         .with_method("setareatag", area::rpc::set_tag)
                         .with_method("removeareatag", area::rpc::remove_tag)
                         .with_method("gettrendingcountries", area::rpc::get_trending_countries)