Minor fixes (#838)

* fix(backend): do not import `tracing::instrument`

* refactor(backend): initial draft of new media list

* feat(backend): complete remaining filters

* feat(backend): make the queries more readable

* refactor(backend): inline var

* feat(backend): respect the sort by filter

* chore(backend): remove useless clones

* chore(frontend): remove default timer stuff

* fix(backend): group by correct place

* fix(frontend): default sort by last updated

* feat(backend): remove useless config param

* chore(frontend): remove preference

* chore(frontend): change order of inputs

* feat(backend): get whether collection is default

* fix(backend): correct calc for default collection

* feat(frontend): separate tab for default collections

* build(backend): bump version

* fix(frontend): remove delete btn for default collections

* fix(frontend): do not allow editing default collection names

* chore(frontend): change label

apps/backend/Cargo.toml

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

apps/backend/src/fitness/resolver.rs

@@ -18,7 +18,6 @@ use sea_query::{extension::postgres::PgExpr, Alias, Condition, Expr, Func, JoinT
 use serde::{Deserialize, Serialize};
 use slug::slugify;
 use struson::writer::{JsonStreamWriter, JsonWriter};
-use tracing::instrument;
 
 use crate::{
     background::ApplicationJob,
@@ -588,7 +587,7 @@ impl ExerciseService {
         })
     }
 
-    #[instrument(skip(self))]
+    #[tracing::instrument(skip(self))]
     pub async fn deploy_update_exercise_library_job(&self) -> Result<i32> {
         let exercises = self.get_all_exercises_from_dataset().await?;
         let mut job_ids = vec![];
@@ -603,7 +602,7 @@ impl ExerciseService {
         Ok(job_ids.len().try_into().unwrap())
     }
 
-    #[instrument(skip(self, ex))]
+    #[tracing::instrument(skip(self, ex))]
     pub async fn update_github_exercise(&self, ex: GithubExercise) -> Result<()> {
         let attributes = ExerciseAttributes {
             instructions: ex.attributes.instructions,
@@ -723,7 +722,7 @@ impl ExerciseService {
         }
     }
 
-    #[instrument(skip(self, input))]
+    #[tracing::instrument(skip(self, input))]
     pub async fn create_user_workout(
         &self,
         user_id: i32,

apps/backend/src/importer/mod.rs

@@ -11,7 +11,6 @@ use sea_orm::{
     QueryOrder,
 };
 use serde::{Deserialize, Serialize};
-use tracing::instrument;
 
 use crate::{
     background::ApplicationJob,
@@ -252,7 +251,7 @@ impl ImporterService {
         Ok(reports)
     }
 
-    #[instrument(skip(self, input))]
+    #[tracing::instrument(skip(self, input))]
     pub async fn start_importing(
         &self,
         user_id: i32,

apps/backend/src/integrations.rs

@@ -7,7 +7,6 @@ use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter};
 use sea_query::{extension::postgres::PgExpr, Alias, Expr, Func};
 use serde::{Deserialize, Serialize};
 use surf::{http::headers::AUTHORIZATION, Client};
-use tracing::instrument;
 
 use crate::{
     entities::{metadata, prelude::Metadata},
@@ -260,7 +259,7 @@ impl IntegrationService {
         Ok(payload)
     }
 
-    #[instrument(skip(self, access_token))]
+    #[tracing::instrument(skip(self, access_token))]
     pub async fn audiobookshelf_progress(
         &self,
         base_url: &str,