From 8c43f62545606424f02a3fb3d04c2d1ef6d1b73e Mon Sep 17 00:00:00 2001
From: trisua <tri@swmff.org>
Date: Wed, 9 Apr 2025 21:39:30 -0400
Subject: [PATCH] fix: use default (non-member) membership when membership
 doesn't exist

---
 crates/app/src/public/html/components.html | 2 +-
 crates/app/src/routes/pages/communities.rs | 4 ++--
 crates/core/src/database/memberships.rs    | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/app/src/public/html/components.html b/crates/app/src/public/html/components.html
index 3dd6095..397b464 100644
--- a/crates/app/src/public/html/components.html
+++ b/crates/app/src/public/html/components.html
@@ -470,7 +470,7 @@ user.settings.theme_hue %}
 {% if user.settings.theme_preference %}
 <script>
     function match_user_theme() {
-        const pref = "{{ profile.settings.theme_preference }}".toLowercase();
+        const pref = "{{ profile.settings.theme_preference }}".toLowerCase();
 
         if (pref === "auto") {
             return;
diff --git a/crates/app/src/routes/pages/communities.rs b/crates/app/src/routes/pages/communities.rs
index 3243b6d..93e095d 100644
--- a/crates/app/src/routes/pages/communities.rs
+++ b/crates/app/src/routes/pages/communities.rs
@@ -9,7 +9,7 @@ use axum_extra::extract::CookieJar;
 use tera::Context;
 use tetratto_core::model::{
     auth::User,
-    communities::{Community, CommunityMembership, CommunityReadAccess},
+    communities::{Community, CommunityReadAccess},
     communities_permissions::CommunityPermission,
     permissions::FinePermission,
     Error,
@@ -304,7 +304,7 @@ pub async fn settings_request(
         .await
     {
         Ok(m) => m,
-        Err(_) => CommunityMembership::new(user.id, community.id, CommunityPermission::DEFAULT),
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
     };
 
     if user.id != community.owner
diff --git a/crates/core/src/database/memberships.rs b/crates/core/src/database/memberships.rs
index 2de3690..ea9e411 100644
--- a/crates/core/src/database/memberships.rs
+++ b/crates/core/src/database/memberships.rs
@@ -75,7 +75,12 @@ impl DataManager {
         );
 
         if res.is_err() {
-            return Err(Error::GeneralNotFound("community membership".to_string()));
+            // return Err(Error::GeneralNotFound("community membership".to_string()));
+            return Ok(CommunityMembership::new(
+                owner,
+                community,
+                CommunityPermission::DEFAULT,
+            ));
         }
 
         Ok(res.unwrap())