From 3c50dba3f83b8ab5c38b00af1d7ce12fe2c8475f Mon Sep 17 00:00:00 2001
From: alemi <me@alemi.dev>
Date: Fri, 31 May 2024 00:11:03 +0200
Subject: [PATCH] fix: trait signatures

---
 src/server/fetcher.rs | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/server/fetcher.rs b/src/server/fetcher.rs
index f8928416..1460aa5b 100644
--- a/src/server/fetcher.rs
+++ b/src/server/fetcher.rs
@@ -16,14 +16,6 @@ pub enum PullResult<T> {
 	Object(T),
 }
 
-impl<T> PullResult<T> {
-	pub fn inner(self) -> T {
-		match self {
-			Self::Actor(x) | Self::Activity(x) | Self::Object(x) => x
-		}
-	}
-}
-
 impl PullResult<serde_json::Value> {
 	pub fn actor(self) -> crate::Result<serde_json::Value> {
 		match self {
@@ -48,21 +40,12 @@ impl PullResult<serde_json::Value> {
 			Self::Object(x) => Ok(x),
 		}
 	}
-
-	pub async fn resolve(self, ctx: &(impl Fetcher + Sync)) -> crate::Result<()> {
-		match self {
-			Self::Actor(x) => { ctx.resolve_user(x).await?; },
-			Self::Object(x) => { ctx.resolve_object(x).await?; },
-			Self::Activity(x) => { ctx.resolve_activity(x).await?; },
-		}
-		Ok(())
-	}
 }
 
 #[axum::async_trait]
 pub trait Fetcher {
 	async fn pull(&self, id: &str) -> crate::Result<PullResult<serde_json::Value>> { self.pull_r(id, 0).await }
-	async fn pull_r(&self, id: &str, depth: i32) -> crate::Result<PullResult<serde_json::Value>>;
+	async fn pull_r(&self, id: &str, depth: u32) -> crate::Result<PullResult<serde_json::Value>>;
 
 
 	async fn webfinger(&self, user: &str, host: &str) -> crate::Result<String>;