fix: fix tag stuff

Author: Fleeym

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "geode-index"
-version = "0.43.3"
+version = "0.43.4"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -2,19 +2,20 @@ use crate::types::api::ApiError;
 use crate::types::models::tag::Tag;
 use sqlx::PgConnection;
 
-pub async fn get_all(conn: &mut PgConnection) -> Result<Vec<Tag>, ApiError> {
+pub async fn get_all_writable(conn: &mut PgConnection) -> Result<Vec<Tag>, ApiError> {
     let tags = sqlx::query!(
         "SELECT
             id,
             name,
             display_name,
             is_readonly
-        FROM mod_tags"
+        FROM mod_tags
+        where is_readonly = false"
     )
     .fetch_all(&mut *conn)
     .await
     .map_err(|e| {
-        log::error!("mod_tags::get_tags failed: {}", e);
+        log::error!("mod_tags::get_all_writeable failed: {}", e);
         ApiError::DbError
     })?
     .into_iter()
@@ -29,6 +30,33 @@ pub async fn get_all(conn: &mut PgConnection) -> Result<Vec<Tag>, ApiError> {
     Ok(tags)
 }
 
+pub async fn get_all(conn: &mut PgConnection) -> Result<Vec<Tag>, ApiError> {
+    let tags = sqlx::query!(
+        "SELECT
+            id,
+            name,
+            display_name,
+            is_readonly
+        FROM mod_tags"
+    )
+        .fetch_all(&mut *conn)
+        .await
+        .map_err(|e| {
+            log::error!("mod_tags::get_all failed: {}", e);
+            ApiError::DbError
+        })?
+        .into_iter()
+        .map(|i| Tag {
+            id: i.id,
+            display_name: i.display_name.unwrap_or(i.name.clone()),
+            name: i.name,
+            is_readonly: i.is_readonly,
+        })
+        .collect::<Vec<Tag>>();
+
+    Ok(tags)
+}
+
 pub async fn get_for_mod(id: &str, conn: &mut PgConnection) -> Result<Vec<Tag>, ApiError> {
     sqlx::query!(
         "SELECT
@@ -67,7 +95,7 @@ pub async fn parse_tag_list(
         return Ok(vec![]);
     }
 
-    let db_tags = get_all(conn).await?;
+    let db_tags = get_all_writable(conn).await?;
 
     let mut ret = Vec::new();
     for tag in tags {
@@ -104,7 +132,7 @@ pub async fn update_for_mod(
 
     let deletable = existing
         .iter()
-        .filter(|e| !tags.iter().any(|t| e.id == t.id))
+        .filter(|e| !e.is_readonly && !tags.iter().any(|t| e.id == t.id))
         .map(|x| x.id)
         .collect::<Vec<_>>();
 

src/database/repository/mod_tags.rs

@@ -11,7 +11,7 @@ pub async fn index(data: web::Data<AppData>) -> Result<impl Responder, ApiError>
         .acquire()
         .await
         .or(Err(ApiError::DbAcquireError))?;
-    let tags = mod_tags::get_all(&mut pool)
+    let tags = mod_tags::get_all_writable(&mut pool)
         .await?
         .into_iter()
         .map(|tag| tag.name)