Always use remote url for discord rpc image (#2009)

* add option to force remote url for api calls

* force remote url for discord rpc image

src/renderer/api/jellyfin/jellyfin-api.ts

@@ -404,11 +404,12 @@ export const createAuthHeader = (): string => {
 };
 
 export const jfApiClient = (args: {
+    forceRemoteUrl?: boolean;
     server: null | ServerListItemWithCredential;
     signal?: AbortSignal;
     url?: string;
 }) => {
-    const { server, signal, url } = args;
+    const { forceRemoteUrl, server, signal, url } = args;
 
     return initClient(contract, {
         api: async ({ body, headers, method, path }) => {
@@ -418,7 +419,7 @@ export const jfApiClient = (args: {
             const { params, path: api } = parsePath(path);
 
             if (server) {
-                const serverUrl = getServerUrl(server);
+                const serverUrl = getServerUrl(server, forceRemoteUrl);
                 baseUrl = serverUrl;
                 token = server?.credential;
             } else {

src/renderer/api/navidrome/navidrome-api.ts

@@ -479,11 +479,12 @@ axiosClient.interceptors.response.use(
 );
 
 export const ndApiClient = (args: {
+    forceRemoteUrl?: boolean;
     server: null | ServerListItemWithCredential;
     signal?: AbortSignal;
     url?: string;
 }) => {
-    const { server, signal, url } = args;
+    const { forceRemoteUrl, server, signal, url } = args;
 
     return initClient(contract, {
         api: async ({ body, headers, method, path }) => {
@@ -493,7 +494,7 @@ export const ndApiClient = (args: {
             const { params, path: api } = parsePath(path);
 
             if (server) {
-                const serverUrl = getServerUrl(server);
+                const serverUrl = getServerUrl(server, forceRemoteUrl);
                 baseUrl = serverUrl ? `${serverUrl}/api` : undefined;
                 token = server?.ndCredential;
             } else {

src/renderer/api/subsonic/subsonic-api.ts

@@ -428,12 +428,13 @@ const silentlyTransformResponse = (data: any) => {
 };
 
 export const ssApiClient = (args: {
+    forceRemoteUrl?: boolean;
     server: null | ServerListItemWithCredential;
     signal?: AbortSignal;
     silent?: boolean;
     url?: string;
 }) => {
-    const { server, signal, silent, url } = args;
+    const { forceRemoteUrl, server, signal, silent, url } = args;
 
     return initClient(contract, {
         api: async ({ body, headers, method, path, rawQuery }) => {
@@ -443,7 +444,7 @@ export const ssApiClient = (args: {
             const { params, path: api } = parsePath(path);
 
             if (server) {
-                const serverUrl = getServerUrl(server);
+                const serverUrl = getServerUrl(server, forceRemoteUrl);
                 baseUrl = serverUrl ? `${serverUrl}/rest` : undefined;
                 const token = server.credential;
                 const params = token.split(/&?\w=/gm);

src/renderer/features/discord-rpc/use-discord-rpc.ts

@@ -284,7 +284,10 @@ export const useDiscordRpc = () => {
                         ) {
                             try {
                                 const info = await api.controller.getAlbumInfo({
-                                    apiClientProps: { serverId: song._serverId },
+                                    apiClientProps: {
+                                        forceRemoteUrl: true,
+                                        serverId: song._serverId,
+                                    },
                                     query: { id: song.albumId },
                                 });
 

src/shared/types/domain-types.ts

@@ -421,6 +421,7 @@ type ApiContext = {
 
 type BaseEndpointArgs = {
     apiClientProps: {
+        forceRemoteUrl?: boolean;
         server?: null | ServerListItemWithCredential;
         serverId: string;
         signal?: AbortSignal;