Remove collection visibility (#816)

* chore(backend): remove resolver

* chore(frontend): new url structure for apps

* feat(database): migration to drop visibility from collection

* feat(backend): remove all refs to collection visibility

* feat(frontend): no more visibility stuff with collections

* build(backend): bump version

Author: IgnisDa

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ryot"
-version = "5.2.1"
+version = "5.2.2"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-3.0"

apps/backend/Cargo.toml

@@ -1,7 +1,6 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use async_graphql::SimpleObject;
-use database::Visibility;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
@@ -17,7 +16,6 @@ pub struct Model {
     pub description: Option<String>,
     #[graphql(skip)]
     pub user_id: i32,
-    pub visibility: Visibility,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

apps/backend/src/entities/collection.rs

@@ -1,5 +1,5 @@
 use async_graphql::Result;
-use database::{ImportSource, MediaLot, MediaSource, Visibility};
+use database::{ImportSource, MediaLot, MediaSource};
 use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 use sea_orm::prelude::DateTimeUtc;
@@ -170,10 +170,6 @@ pub async fn import(input: DeployMediaTrackerImportInput) -> Result<ImportResult
                 "" => None,
                 x => Some(x.to_owned()),
             }),
-            visibility: Some(match l.privacy {
-                ListPrivacy::Private => Visibility::Private,
-                ListPrivacy::Public => Visibility::Public,
-            }),
             update_id: None,
         })
         .collect();

apps/backend/src/importer/media_tracker.rs

@@ -94,11 +94,10 @@ use crate::{
             MetadataVideoSource, MovieSpecifics, PartialMetadata, PartialMetadataPerson,
             PartialMetadataWithoutId, PeopleSearchItem, PersonSourceSpecifics, PodcastSpecifics,
             PostReviewInput, ProgressUpdateError, ProgressUpdateErrorVariant, ProgressUpdateInput,
-            ProgressUpdateResultUnion, PublicCollectionItem, ReviewPostedEvent,
-            SeenAnimeExtraInformation, SeenMangaExtraInformation, SeenPodcastExtraInformation,
-            SeenShowExtraInformation, ShowSpecifics, UserMediaOwnership, UserMediaReminder,
-            UserSummary, UserToMediaReason, VideoGameSpecifics, VisualNovelSpecifics,
-            WatchProvider,
+            ProgressUpdateResultUnion, ReviewPostedEvent, SeenAnimeExtraInformation,
+            SeenMangaExtraInformation, SeenPodcastExtraInformation, SeenShowExtraInformation,
+            ShowSpecifics, UserMediaOwnership, UserMediaReminder, UserSummary, UserToMediaReason,
+            VideoGameSpecifics, VisualNovelSpecifics, WatchProvider,
         },
         BackgroundJob, ChangeCollectionToEntityInput, EntityLot, IdAndNamedObject, IdObject,
         MediaStateChanged, SearchDetails, SearchInput, SearchResults, StoredUrl,
@@ -369,7 +368,6 @@ struct CollectionItem {
     name: String,
     num_items: u64,
     description: Option<String>,
-    visibility: Visibility,
 }
 
 #[derive(SimpleObject)]
@@ -817,25 +815,14 @@ impl MiscellaneousQuery {
         service.user_collections_list(user_id, name).await
     }
 
-    /// Get a list of publicly visible collections.
-    async fn public_collections_list(
-        &self,
-        gql_ctx: &Context<'_>,
-        input: SearchInput,
-    ) -> Result<SearchResults<PublicCollectionItem>> {
-        let service = gql_ctx.data_unchecked::<Arc<MiscellaneousService>>();
-        service.public_collections_list(input).await
-    }
-
     /// Get the contents of a collection and respect visibility.
     async fn collection_contents(
         &self,
         gql_ctx: &Context<'_>,
         input: CollectionContentsInput,
     ) -> Result<CollectionContents> {
         let service = gql_ctx.data_unchecked::<Arc<MiscellaneousService>>();
-        let user_id = service.user_id_from_ctx(gql_ctx).await.ok();
-        service.collection_contents(user_id, input).await
+        service.collection_contents(input).await
     }
 
     /// Get details about a media present in the database.
@@ -4068,68 +4055,14 @@ impl MiscellaneousService {
                 id: collection.id,
                 name: collection.name,
                 description: collection.description,
-                visibility: collection.visibility,
                 num_items,
             });
         }
         Ok(data)
     }
 
-    async fn public_collections_list(
-        &self,
-        input: SearchInput,
-    ) -> Result<SearchResults<PublicCollectionItem>> {
-        let page: u64 = input.page.unwrap_or(1).try_into().unwrap();
-        let c_alias = Alias::new("collection");
-        let u_alias = Alias::new("user");
-        let paginator = Collection::find()
-            .select_only()
-            .column_as(Expr::col((c_alias.clone(), collection::Column::Id)), "id")
-            .column_as(Expr::col((u_alias, user::Column::Name)), "username")
-            .column(collection::Column::Name)
-            .filter(collection::Column::Visibility.eq(Visibility::Public))
-            .apply_if(input.query, |query, v| {
-                query.filter(
-                    Condition::any()
-                        .add(
-                            Expr::col((c_alias.clone(), collection::Column::Name))
-                                .ilike(ilike_sql(&v)),
-                        )
-                        .add(
-                            Expr::col((c_alias.clone(), collection::Column::Description))
-                                .ilike(ilike_sql(&v)),
-                        ),
-                )
-            })
-            .left_join(User)
-            .order_by_desc(collection::Column::LastUpdatedOn)
-            .into_model::<PublicCollectionItem>()
-            .paginate(&self.db, self.config.frontend.page_size.try_into().unwrap());
-        let mut data = vec![];
-        let ItemsAndPagesNumber {
-            number_of_items,
-            number_of_pages,
-        } = paginator.num_items_and_pages().await?;
-        for collection in paginator.fetch_page(page - 1).await? {
-            data.push(collection);
-        }
-        let results = SearchResults {
-            details: SearchDetails {
-                total: number_of_items.try_into().unwrap(),
-                next_page: if page < number_of_pages {
-                    Some((page + 1).try_into().unwrap())
-                } else {
-                    None
-                },
-            },
-            items: data,
-        };
-        Ok(results)
-    }
-
     async fn collection_contents(
         &self,
-        user_id: Option<i32>,
         input: CollectionContentsInput,
     ) -> Result<CollectionContents> {
         let search = input.search.unwrap_or_default();
@@ -4144,20 +4077,6 @@ impl MiscellaneousService {
             Some(c) => c,
             None => return Err(Error::new("Collection not found".to_owned())),
         };
-        if collection.visibility != Visibility::Public {
-            match user_id {
-                None => {
-                    return Err(Error::new(
-                        "Need to be logged in to view a private collection".to_owned(),
-                    ));
-                }
-                Some(u) => {
-                    if u != collection.user_id {
-                        return Err(Error::new("This collection is not public".to_owned()));
-                    }
-                }
-            }
-        }
 
         let take = input
             .take
@@ -4422,16 +4341,13 @@ impl MiscellaneousService {
             } else if let Some(ci) = insert.collection_id.unwrap() {
                 (
                     ci,
-                    self.collection_contents(
-                        Some(user_id),
-                        CollectionContentsInput {
-                            collection_id: ci,
-                            filter: None,
-                            search: None,
-                            take: None,
-                            sort: None,
-                        },
-                    )
+                    self.collection_contents(CollectionContentsInput {
+                        collection_id: ci,
+                        filter: None,
+                        search: None,
+                        take: None,
+                        sort: None,
+                    })
                     .await?
                     .details
                     .name,
@@ -4525,10 +4441,6 @@ impl MiscellaneousService {
                     name: ActiveValue::Set(new_name),
                     user_id: ActiveValue::Set(user_id.to_owned()),
                     description: ActiveValue::Set(input.description),
-                    visibility: match input.visibility {
-                        None => ActiveValue::NotSet,
-                        Some(v) => ActiveValue::Set(v),
-                    },
                     ..Default::default()
                 };
                 let inserted = col.save(&self.db).await.map_err(|_| {

apps/backend/src/miscellaneous/resolver.rs

@@ -99,10 +99,6 @@ pub struct SearchDetails {
     name = "MetadataGroupSearchResults",
     params(media::MetadataGroupSearchItem)
 ))]
-#[graphql(concrete(
-    name = "PublicCollectionsListResults",
-    params(media::PublicCollectionItem)
-))]
 #[graphql(concrete(
     name = "MediaCreatorSearchResults",
     params(media::MediaCreatorSearchItem)
@@ -184,13 +180,6 @@ pub enum MediaStateChanged {
 pub mod media {
     use super::*;
 
-    #[derive(Clone, Debug, PartialEq, Eq, FromQueryResult, SimpleObject)]
-    pub struct PublicCollectionItem {
-        pub id: i32,
-        pub name: String,
-        pub username: String,
-    }
-
     #[derive(Debug, SimpleObject, Serialize, Deserialize, Clone)]
     pub struct MetadataSearchItemWithLot {
         pub details: MetadataSearchItem,
@@ -254,7 +243,6 @@ pub mod media {
     pub struct CreateOrUpdateCollectionInput {
         pub name: String,
         pub description: Option<String>,
-        pub visibility: Option<Visibility>,
         pub update_id: Option<i32>,
     }
 

apps/backend/src/models.rs

@@ -29,7 +29,7 @@ import {
 	GraphqlSortOrder,
 	MediaLot,
 } from "@ryot/generated/graphql/backend/graphql";
-import { changeCase, startCase } from "@ryot/ts-utils";
+import { startCase } from "@ryot/ts-utils";
 import {
 	IconBucketDroplet,
 	IconFilter,
@@ -162,9 +162,6 @@ export default function Page() {
 			<Container>
 				<Stack>
 					<Box>
-						<Text c="dimmed" size="xs" mb={-10}>
-							{changeCase(loaderData.info.details.visibility)}
-						</Text>
 						<Title>{loaderData.info.details.name}</Title>{" "}
 						<Text size="sm">
 							{loaderData.contents.details.total} items, created by{" "}