From 63454aa9bd9fd4ee293c316e7ca15c88e6c5ca2a Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sun, 24 Sep 2023 22:41:56 +0200
Subject: fix federated assets (doesnt work bc dav1d-sys)

---
 server/src/import.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'server/src/import.rs')

diff --git a/server/src/import.rs b/server/src/import.rs
index 6e422cd..8859873 100644
--- a/server/src/import.rs
+++ b/server/src/import.rs
@@ -7,7 +7,7 @@ use crate::{database::Database, federation::Federation, CONF};
 use anyhow::{anyhow, bail, Context, Ok};
 use async_recursion::async_recursion;
 use futures::{stream::FuturesUnordered, StreamExt, TryFutureExt};
-use jellybase::cache_file;
+use jellybase::{cache_file, AssetLocationExt};
 use jellyclient::Session;
 use jellycommon::{AssetLocation, MediaSource, Node, NodePrivate, RemoteImportOptions};
 use log::{debug, error, info};
@@ -139,7 +139,7 @@ async fn import_remote(
 ) -> anyhow::Result<Vec<String>> {
     let _permit = SEM_REMOTE_IMPORT.acquire().await.unwrap();
     info!("loading federated node {identifier:?}");
-    
+
     let flatten = opts.flatten;
     opts.flatten = false;
 
@@ -159,8 +159,8 @@ async fn import_remote(
         let mut node = Node {
             public: node.clone(),
             private: NodePrivate {
-                backdrop: Some(AssetLocation::Cache(backdrop)),
-                poster: Some(AssetLocation::Cache(poster)),
+                backdrop: Some(backdrop),
+                poster: Some(poster),
                 import: None,
                 id: None,
                 source: Some(MediaSource::Remote {
@@ -214,11 +214,11 @@ async fn cache_federation_asset(
     session: &Session,
     identifier: &String,
     role: &str,
-) -> anyhow::Result<PathBuf> {
+) -> anyhow::Result<AssetLocation> {
     let poster = cache_file(&["federation-asset", role, identifier]);
-    if !poster.exists() {
+    if !poster.path().exists() {
         session
-            .node_asset(&identifier, role, File::create(&poster)?)
+            .node_asset(&identifier, role, File::create(&poster.path())?)
             .await?;
     }
     Ok(poster)
-- 
cgit v1.2.3-70-g09d2