From a761b7dd35a5bd61bb4eb0275b75d1e0977e6a2d Mon Sep 17 00:00:00 2001 From: Brandon Cohen Date: Wed, 21 Jun 2023 13:18:50 -0400 Subject: [PATCH 1/4] fix: resolved issue with create slider causing incorrect form submission (#3514) --- src/components/Selector/index.tsx | 1 + src/components/Slider/index.tsx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/components/Selector/index.tsx b/src/components/Selector/index.tsx index 78ae33ea..7b216587 100644 --- a/src/components/Selector/index.tsx +++ b/src/components/Selector/index.tsx @@ -437,6 +437,7 @@ export const WatchProviderSelector = ({ {otherProviders.length > 0 && ( @@ -165,6 +166,7 @@ const Slider = ({ }`} onClick={() => slide(Direction.RIGHT)} disabled={scrollPos.isEnd} + type="button" > From 01de972a8fe2ea3c18d5b2f426d01b5b14d142d4 Mon Sep 17 00:00:00 2001 From: TheCatLady <52870424+TheCatLady@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:34:10 -0700 Subject: [PATCH 2/4] fix(statusbadge): handle missing season/episode number (#3526) --- src/components/StatusBadge/index.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/StatusBadge/index.tsx b/src/components/StatusBadge/index.tsx index 3dbe6e74..b60b7af0 100644 --- a/src/components/StatusBadge/index.tsx +++ b/src/components/StatusBadge/index.tsx @@ -166,11 +166,11 @@ const StatusBadge = ({ {inProgress && ( <> - {mediaType === 'tv' && ( + {mediaType === 'tv' && downloadItem[0].episode && ( {intl.formatMessage(messages.seasonepisodenumber, { - seasonNumber: downloadItem[0].episode?.seasonNumber, - episodeNumber: downloadItem[0].episode?.episodeNumber, + seasonNumber: downloadItem[0].episode.seasonNumber, + episodeNumber: downloadItem[0].episode.episodeNumber, })} )} @@ -219,11 +219,11 @@ const StatusBadge = ({ {inProgress && ( <> - {mediaType === 'tv' && ( + {mediaType === 'tv' && downloadItem[0].episode && ( {intl.formatMessage(messages.seasonepisodenumber, { - seasonNumber: downloadItem[0].episode?.seasonNumber, - episodeNumber: downloadItem[0].episode?.episodeNumber, + seasonNumber: downloadItem[0].episode.seasonNumber, + episodeNumber: downloadItem[0].episode.episodeNumber, })} )} @@ -272,11 +272,11 @@ const StatusBadge = ({ {inProgress && ( <> - {mediaType === 'tv' && ( + {mediaType === 'tv' && downloadItem[0].episode && ( {intl.formatMessage(messages.seasonepisodenumber, { - seasonNumber: downloadItem[0].episode?.seasonNumber, - episodeNumber: downloadItem[0].episode?.episodeNumber, + seasonNumber: downloadItem[0].episode.seasonNumber, + episodeNumber: downloadItem[0].episode.episodeNumber, })} )} From 2816c66300bf870d493c0665b0e984d60f707dfd Mon Sep 17 00:00:00 2001 From: "Anton K. (ai Doge)" Date: Tue, 18 Jul 2023 01:03:52 -0400 Subject: [PATCH 3/4] fix: resolved user access check issue (#3551) * fix: importing friends update checkUserAccess to use getUsers * refactor(server/api/plextv.ts): clean up removed unused getFriends function, and its interface. renamed friends variable. --- server/api/plextv.ts | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/server/api/plextv.ts b/server/api/plextv.ts index 76ee6618..70492689 100644 --- a/server/api/plextv.ts +++ b/server/api/plextv.ts @@ -82,21 +82,6 @@ interface ServerResponse { }; } -interface FriendResponse { - MediaContainer: { - User: { - $: { - id: string; - title: string; - username: string; - email: string; - thumb: string; - }; - Server?: ServerResponse[]; - }[]; - }; -} - interface UsersResponse { MediaContainer: { User: { @@ -234,19 +219,6 @@ class PlexTvAPI extends ExternalAPI { } } - public async getFriends(): Promise { - const response = await this.axios.get('/pms/friends/all', { - transformResponse: [], - responseType: 'text', - }); - - const parsedXml = (await xml2js.parseStringPromise( - response.data - )) as FriendResponse; - - return parsedXml; - } - public async checkUserAccess(userId: number): Promise { const settings = getSettings(); @@ -255,9 +227,9 @@ class PlexTvAPI extends ExternalAPI { throw new Error('Plex is not configured!'); } - const friends = await this.getFriends(); + const usersResponse = await this.getUsers(); - const users = friends.MediaContainer.User; + const users = usersResponse.MediaContainer.User; const user = users.find((u) => parseInt(u.$.id) === userId); From 68c7b3650ec82437bdb128f72f734e227ad763cb Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 05:17:07 +0000 Subject: [PATCH 4/4] docs: add scorp200 as a contributor for code (#3555) [skip ci] * docs: update README.md * docs: update .all-contributorsrc --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 37187275..f2904499 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -872,6 +872,15 @@ "contributions": [ "code" ] + }, + { + "login": "scorp200", + "name": "Anton K. (ai Doge)", + "avatar_url": "https://avatars.githubusercontent.com/u/9427639?v=4", + "profile": "http://aidoge.xyz", + "contributions": [ + "code" + ] } ], "badgeTemplate": "\"All-orange.svg\"/>", diff --git a/README.md b/README.md index 6fe73c27..0f6e3241 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Translation status GitHub -All Contributors +All Contributors

@@ -196,6 +196,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Salman Tariq
Salman Tariq
💻 Andrew Kennedy
Andrew Kennedy
💻 Fallenbagel
Fallenbagel
💻 + Anton K. (ai Doge)
Anton K. (ai Doge)
💻