aboutsummaryrefslogtreecommitdiff
path: root/server/src/routes/ui
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-01-20 12:13:20 +0100
committermetamuffin <metamuffin@disroot.org>2024-01-20 12:13:20 +0100
commit730353601db9818d148c85bfe1ecb119abaab7cc (patch)
tree0e3deafdac53ebc612a04b3631e5cf286c825291 /server/src/routes/ui
parent3086e768ab4e64e47a50d7f6a71a815c4f110bd3 (diff)
downloadjellything-730353601db9818d148c85bfe1ecb119abaab7cc.tar
jellything-730353601db9818d148c85bfe1ecb119abaab7cc.tar.bz2
jellything-730353601db9818d148c85bfe1ecb119abaab7cc.tar.zst
cleanup yesterdays mess
Diffstat (limited to 'server/src/routes/ui')
-rw-r--r--server/src/routes/ui/admin/log.rs2
-rw-r--r--server/src/routes/ui/assets.rs1
-rw-r--r--server/src/routes/ui/error.rs16
-rw-r--r--server/src/routes/ui/node.rs1
4 files changed, 12 insertions, 8 deletions
diff --git a/server/src/routes/ui/admin/log.rs b/server/src/routes/ui/admin/log.rs
index de91acd..9e57bab 100644
--- a/server/src/routes/ui/admin/log.rs
+++ b/server/src/routes/ui/admin/log.rs
@@ -20,7 +20,7 @@ use std::{
sync::{LazyLock, RwLock},
};
-const MAX_LOG_LEN: usize = 4000;
+const MAX_LOG_LEN: usize = 4096;
static LOGGER: LazyLock<Log> = LazyLock::new(Log::new);
diff --git a/server/src/routes/ui/assets.rs b/server/src/routes/ui/assets.rs
index b1a13da..05ddc7c 100644
--- a/server/src/routes/ui/assets.rs
+++ b/server/src/routes/ui/assets.rs
@@ -34,6 +34,7 @@ pub async fn r_item_assets(
.get(&db, id)?
.only_if_permitted(&session.user.permissions)
.ok_or(anyhow!("node does not exist"))?;
+
let mut asset = match role {
AssetRole::Backdrop => node.private.backdrop,
AssetRole::Poster => node.private.poster,
diff --git a/server/src/routes/ui/error.rs b/server/src/routes/ui/error.rs
index 98c6b7f..c0685e1 100644
--- a/server/src/routes/ui/error.rs
+++ b/server/src/routes/ui/error.rs
@@ -103,36 +103,38 @@ impl From<serde_json::Error> for MyError {
}
impl From<jellybase::database::CommitError> for MyError {
fn from(err: jellybase::database::CommitError) -> Self {
- MyError(anyhow::anyhow!("{err}"))
+ MyError(anyhow::anyhow!("database oopsie during commit: {err}"))
}
}
impl From<jellybase::database::CompactionError> for MyError {
fn from(err: jellybase::database::CompactionError) -> Self {
- MyError(anyhow::anyhow!("{err}"))
+ MyError(anyhow::anyhow!("database oopsie during compaction: {err}"))
}
}
impl From<jellybase::database::DatabaseError> for MyError {
fn from(err: jellybase::database::DatabaseError) -> Self {
- MyError(anyhow::anyhow!("{err}"))
+ MyError(anyhow::anyhow!("generic database oopsie: {err}"))
}
}
impl From<jellybase::database::SavepointError> for MyError {
fn from(err: jellybase::database::SavepointError) -> Self {
- MyError(anyhow::anyhow!("{err}"))
+ MyError(anyhow::anyhow!(
+ "database oopsie during savepointing: {err}"
+ ))
}
}
impl From<jellybase::database::StorageError> for MyError {
fn from(err: jellybase::database::StorageError) -> Self {
- MyError(anyhow::anyhow!("{err}"))
+ MyError(anyhow::anyhow!("database oopsie, storage error: {err}"))
}
}
impl From<jellybase::database::TableError> for MyError {
fn from(err: jellybase::database::TableError) -> Self {
- MyError(anyhow::anyhow!("{err}"))
+ MyError(anyhow::anyhow!("database oopsie, table error: {err}"))
}
}
impl From<jellybase::database::TransactionError> for MyError {
fn from(err: jellybase::database::TransactionError) -> Self {
- MyError(anyhow::anyhow!("{err}"))
+ MyError(anyhow::anyhow!("database oopsie during transaction: {err}"))
}
}
diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index c055953..4b3f861 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -255,6 +255,7 @@ impl DatabaseNodeUserDataExt for DataAcid {
id.to_owned(),
T_NODE
.get(self, id)?
+ .only_if_permitted(&session.user.permissions)
.ok_or(anyhow!("node does not exist: {id}"))?
.public,
T_USER_NODE