diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-01-24 21:55:30 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-01-24 21:55:30 +0100 |
| commit | 9d08704069f09f185eac0b80653cc39c1335c852 (patch) | |
| tree | 37dac88f50c631716ce56d8b464bdc5459f143fc | |
| parent | dcd6b024c6874c17e739ad62f80eb3e212ec5e91 (diff) | |
| download | jellything-9d08704069f09f185eac0b80653cc39c1335c852.tar jellything-9d08704069f09f185eac0b80653cc39c1335c852.tar.bz2 jellything-9d08704069f09f185eac0b80653cc39c1335c852.tar.zst | |
poster relative to library
| -rw-r--r-- | base/src/assetfed.rs | 6 | ||||
| -rw-r--r-- | import/src/lib.rs | 4 | ||||
| -rw-r--r-- | server/src/routes/ui/assets.rs | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/base/src/assetfed.rs b/base/src/assetfed.rs index 800e458..0eff59f 100644 --- a/base/src/assetfed.rs +++ b/base/src/assetfed.rs @@ -1,3 +1,4 @@ +use crate::{cache::CachePath, SECRETS}; use aes_gcm_siv::{ aead::{generic_array::GenericArray, Aead}, Aes256GcmSiv, KeyInit, @@ -9,9 +10,7 @@ use jellycommon::Asset; use log::warn; use std::{path::PathBuf, sync::LazyLock}; -use crate::{cache::CachePath, SECRETS}; - -const VERSION: u32 = 2; +const VERSION: u32 = 3; static ASSET_KEY: LazyLock<Aes256GcmSiv> = LazyLock::new(|| { if let Some(sk) = &SECRETS.session_key { @@ -31,6 +30,7 @@ pub enum AssetInner { Federated { host: String, asset: Vec<u8> }, Cache(CachePath), Assets(PathBuf), + Library(PathBuf), } impl AssetInner { diff --git a/import/src/lib.rs b/import/src/lib.rs index 1c04437..f6daa42 100644 --- a/import/src/lib.rs +++ b/import/src/lib.rs @@ -288,10 +288,10 @@ async fn process_source( match s { ImportSource::Override(mut n) => { if let Some(backdrop) = n.private.backdrop.clone() { - n.public.backdrop = Some(AssetInner::Assets(backdrop).ser()); + n.public.backdrop = Some(AssetInner::Library(backdrop).ser()); } if let Some(poster) = n.private.poster.clone() { - n.public.poster = Some(AssetInner::Assets(poster).ser()); + n.public.poster = Some(AssetInner::Library(poster).ser()); } insert_node(&id, n)? } diff --git a/server/src/routes/ui/assets.rs b/server/src/routes/ui/assets.rs index ef73fcc..0290566 100644 --- a/server/src/routes/ui/assets.rs +++ b/server/src/routes/ui/assets.rs @@ -58,6 +58,7 @@ pub async fn resolve_asset(asset: AssetInner, fed: &State<Federation>) -> anyhow } AssetInner::Cache(c) => Ok(c.abs()), AssetInner::Assets(c) => Ok(CONF.asset_path.join(c)), + AssetInner::Library(c) => Ok(CONF.library_path.join(c)), } } |