Merge remote-tracking branch 'upstream/development' into subsonic-2

jeffvli · Sep 23, 2024 · 09da191 · 09da191
2 parents 256f687 + e3946a9
commit 09da191
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/menu.ts b/src/main/menu.ts
@@ -48,15 +48,15 @@ export default class MenuBuilder {
             label: 'Electron',
             submenu: [
                 {
-                    label: 'About ElectronReact',
+                    label: 'About Feishin',
                     selector: 'orderFrontStandardAboutPanel:',
                 },
                 { type: 'separator' },
                 { label: 'Services', submenu: [] },
                 { type: 'separator' },
                 {
                     accelerator: 'Command+H',
-                    label: 'Hide ElectronReact',
+                    label: 'Hide Feishin',
                     selector: 'hide:',
                 },
                 {

diff --git a/src/renderer/api/jellyfin.types.ts b/src/renderer/api/jellyfin.types.ts
@@ -574,7 +574,7 @@ export enum JFSongListSort {
     ARTIST = 'Artist,Album,SortName',
     COMMUNITY_RATING = 'CommunityRating,SortName',
     DURATION = 'Runtime,AlbumArtist,Album,SortName',
-    NAME = 'SortName,Name',
+    NAME = 'Name',
     PLAY_COUNT = 'PlayCount,SortName',
     RANDOM = 'Random,SortName',
     RECENTLY_ADDED = 'DateCreated,SortName',

diff --git a/src/renderer/api/jellyfin/jellyfin-types.ts b/src/renderer/api/jellyfin/jellyfin-types.ts
@@ -545,7 +545,7 @@ const songListSort = {
     ARTIST: 'Artist,Album,SortName',
     COMMUNITY_RATING: 'CommunityRating,SortName',
     DURATION: 'Runtime,AlbumArtist,Album,SortName',
-    NAME: 'SortName,Name',
+    NAME: 'Name',
     PLAY_COUNT: 'PlayCount,SortName',
     RANDOM: 'Random,SortName',
     RECENTLY_ADDED: 'DateCreated,SortName',

diff --git a/src/renderer/api/navidrome.types.ts b/src/renderer/api/navidrome.types.ts
@@ -261,7 +261,7 @@ export type NDSongListParams = {
 
 export enum NDAlbumArtistListSort {
     ALBUM_COUNT = 'albumCount',
-    FAVORITED = 'starred',
+    FAVORITED = 'starred_at',
     NAME = 'name',
     PLAY_COUNT = 'playCount',
     RATING = 'rating',