Fix missing private key for signed fetch

LemmyNet · Mar 7, 2024 · 0531b47 · 0531b47
1 parent fed6b61
commit 0531b47
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/db_schema/src/source/site.rs b/crates/db_schema/src/source/site.rs
@@ -34,7 +34,9 @@ pub struct Site {
   pub last_refreshed_at: DateTime<Utc>,
   /// The site inbox
   pub inbox_url: DbUrl,
+  #[serde(skip)]
   pub private_key: Option<String>,
+  #[serde(skip)]
   pub public_key: String,
   pub instance_id: InstanceId,
   /// If present, nsfw content is visible by default. Should be displayed by frontends/clients

diff --git a/crates/db_views/src/site_view.rs b/crates/db_views/src/site_view.rs
@@ -9,22 +9,21 @@ use lemmy_db_schema::{
 impl SiteView {
   pub async fn read_local(pool: &mut DbPool<'_>) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
-    let mut res = site::table
-      .inner_join(local_site::table)
-      .inner_join(
-        local_site_rate_limit::table.on(local_site::id.eq(local_site_rate_limit::local_site_id)),
-      )
-      .inner_join(site_aggregates::table)
-      .select((
-        site::all_columns,
-        local_site::all_columns,
-        local_site_rate_limit::all_columns,
-        site_aggregates::all_columns,
-      ))
-      .first::<SiteView>(conn)
-      .await?;
-
-    res.site.private_key = None;
-    Ok(res)
+    Ok(
+      site::table
+        .inner_join(local_site::table)
+        .inner_join(
+          local_site_rate_limit::table.on(local_site::id.eq(local_site_rate_limit::local_site_id)),
+        )
+        .inner_join(site_aggregates::table)
+        .select((
+          site::all_columns,
+          local_site::all_columns,
+          local_site_rate_limit::all_columns,
+          site_aggregates::all_columns,
+        ))
+        .first::<SiteView>(conn)
+        .await?,
+    )
   }
 }