Merge branch 'main' into open-source-pro

Author: IgnisDa

crates/resolvers/user/src/lib.rs

@@ -145,7 +145,8 @@ impl UserMutation {
     /// Delete a user. The account deleting the user must be an `Admin`.
     async fn delete_user(&self, gql_ctx: &Context<'_>, to_delete_user_id: String) -> Result<bool> {
         let service = gql_ctx.data_unchecked::<Arc<UserService>>();
-        service.delete_user(to_delete_user_id).await
+        let user_id = self.user_id_from_ctx(gql_ctx).await?;
+        service.delete_user(user_id, to_delete_user_id).await
     }
 
     /// Create a new user for the service. Also set their `lot` as admin if

crates/services/importer/src/trakt.rs

@@ -218,7 +218,10 @@ pub async fn import(input: DeployTraktImportInput) -> Result<ImportResult> {
                     show_episode_number,
                     ..Default::default()
                 });
-                if let Some(a) = media.iter_mut().find(|i| i.source_id == d.source_id) {
+                if let Some(a) = media
+                    .iter_mut()
+                    .find(|i| i.identifier == d.identifier && i.lot == d.lot)
+                {
                     a.seen_history.extend(d.seen_history);
                 } else {
                     media.push(d)
@@ -235,9 +238,7 @@ pub async fn import(input: DeployTraktImportInput) -> Result<ImportResult> {
     })
 }
 
-fn process_item(
-    i: &ListItemResponse,
-) -> std::result::Result<ImportOrExportMediaItem, ImportFailedItem> {
+fn process_item(i: &ListItemResponse) -> Result<ImportOrExportMediaItem, ImportFailedItem> {
     let (source_id, identifier, lot) = if let Some(d) = i.movie.as_ref() {
         (d.ids.trakt, d.ids.tmdb, MediaLot::Movie)
     } else if let Some(d) = i.show.as_ref() {
@@ -251,10 +252,10 @@ fn process_item(
         });
     };
     match identifier {
-        Some(i) => Ok(ImportOrExportMediaItem {
+        Some(identifier) => Ok(ImportOrExportMediaItem {
             source_id: source_id.to_string(),
             lot,
-            identifier: i.to_string(),
+            identifier: identifier.to_string(),
             source: MediaSource::Tmdb,
             seen_history: vec![],
             reviews: vec![],

crates/services/user/src/lib.rs

@@ -245,8 +245,12 @@ impl UserService {
         Ok(users)
     }
 
-    pub async fn delete_user(&self, to_delete_user_id: String) -> Result<bool> {
-        admin_account_guard(&self.db, &to_delete_user_id).await?;
+    pub async fn delete_user(
+        &self,
+        admin_user_id: String,
+        to_delete_user_id: String,
+    ) -> Result<bool> {
+        admin_account_guard(&self.db, &admin_user_id).await?;
         let maybe_user = User::find_by_id(to_delete_user_id).one(&self.db).await?;
         if let Some(u) = maybe_user {
             if self