Compare commits

..

1 Commits

Author SHA1 Message Date
gauthier-th
bd42194f61 fix: add more logs for pingToken 2025-03-16 22:41:27 +01:00
9 changed files with 18 additions and 41 deletions

View File

@@ -58,27 +58,12 @@ All help is welcome and greatly appreciated! If you would like to contribute to
- Be sure to follow both the [code](#contributing-code) and [UI text](#ui-text-style) guidelines. - Be sure to follow both the [code](#contributing-code) and [UI text](#ui-text-style) guidelines.
- Should you need to update your fork, you can do so by rebasing from `upstream`: - Should you need to update your fork, you can do so by rebasing from `upstream`:
```bash ```bash
git fetch upstream git fetch upstream
git rebase upstream/develop git rebase upstream/develop
git push origin BRANCH_NAME -f git push origin BRANCH_NAME -f
``` ```
### Helm Chart
Tools Required:
- [Helm](https://helm.sh/docs/intro/install/)
- [helm-docs](https://github.com/norwoodj/helm-docs)
Steps:
1. Make the necessary changes.
2. Test your changes.
3. Update the `version` in `charts/jellyseerr-chart/Chart.yaml` following [Semantic Versioning (SemVer)](https://semver.org/).
4. Run the `helm-docs` command to regenerate the chart's README.
### Contributing Code ### Contributing Code
- If you are taking on an existing bug or feature ticket, please comment on the [issue](https://github.com/fallenbagel/jellyseerr/issues) to avoid multiple people working on the same thing. - If you are taking on an existing bug or feature ticket, please comment on the [issue](https://github.com/fallenbagel/jellyseerr/issues) to avoid multiple people working on the same thing.

View File

@@ -3,8 +3,8 @@ kubeVersion: ">=1.23.0-0"
name: jellyseerr-chart name: jellyseerr-chart
description: Jellyseerr helm chart for Kubernetes description: Jellyseerr helm chart for Kubernetes
type: application type: application
version: 2.3.2 version: 2.3.0
appVersion: "2.5.1" appVersion: "2.5.0"
maintainers: maintainers:
- name: Jellyseerr - name: Jellyseerr
url: https://github.com/Fallenbagel/jellyseerr url: https://github.com/Fallenbagel/jellyseerr

View File

@@ -1,6 +1,6 @@
# jellyseerr-chart # jellyseerr-chart
![Version: 2.3.2](https://img.shields.io/badge/Version-2.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.1](https://img.shields.io/badge/AppVersion-2.5.1-informational?style=flat-square) ![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
Jellyseerr helm chart for Kubernetes Jellyseerr helm chart for Kubernetes

View File

@@ -4,10 +4,6 @@ metadata:
name: {{ include "jellyseerr.configPersistenceName" . }} name: {{ include "jellyseerr.configPersistenceName" . }}
labels: labels:
{{- include "jellyseerr.labels" . | nindent 4 }} {{- include "jellyseerr.labels" . | nindent 4 }}
{{- with .Values.config.persistence.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec: spec:
{{- with .Values.config.persistence.accessModes }} {{- with .Values.config.persistence.accessModes }}
accessModes: accessModes:

View File

@@ -378,6 +378,7 @@ class PlexTvAPI extends ExternalAPI {
logger.error('Failed to ping token', { logger.error('Failed to ping token', {
label: 'Plex Refresh Token', label: 'Plex Refresh Token',
errorMessage: e.message, errorMessage: e.message,
errorCause: e.cause,
}); });
} }
} }

View File

@@ -999,7 +999,7 @@ export class MediaRequest {
radarrMovie.id, radarrMovie.id,
[this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']: [this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']:
radarrMovie.titleSlug, radarrMovie.titleSlug,
[this.is4k ? 'serviceId4k' : 'serviceId']: radarrSettings?.id, [this.is4k ? 'serviceId4k' : 'serviceId']: radarrMovie?.id,
}; };
await mediaRepository.update({ id: this.media.id }, updateFields); await mediaRepository.update({ id: this.media.id }, updateFields);

View File

@@ -47,11 +47,10 @@ class GotifyAgent
const title = payload.event const title = payload.event
? `${payload.event} - ${payload.subject}` ? `${payload.event} - ${payload.subject}`
: payload.subject; : payload.subject;
let message = payload.message ?? '';
let message = payload.message ? `${payload.message} \n\n` : '';
if (payload.request) { if (payload.request) {
message += `\n**Requested By:** ${payload.request.requestedBy.displayName} `; message += `\n\nRequested By: ${payload.request.requestedBy.displayName}`;
let status = ''; let status = '';
switch (type) { switch (type) {
@@ -74,18 +73,16 @@ class GotifyAgent
} }
if (status) { if (status) {
message += `\n**Request Status:** ${status} `; message += `\nRequest Status: ${status}`;
} }
} else if (payload.comment) { } else if (payload.comment) {
message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message} `; message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message}`;
} else if (payload.issue) { } else if (payload.issue) {
message += `\n\n**Reported By:** ${payload.issue.createdBy.displayName} `; message += `\n\nReported By: ${payload.issue.createdBy.displayName}`;
message += `\n**Issue Type:** ${ message += `\nIssue Type: ${IssueTypeName[payload.issue.issueType]}`;
IssueTypeName[payload.issue.issueType] message += `\nIssue Status: ${
} `;
message += `\n**Issue Status:** ${
payload.issue.status === IssueStatus.OPEN ? 'Open' : 'Resolved' payload.issue.status === IssueStatus.OPEN ? 'Open' : 'Resolved'
} `; }`;
if (type == Notification.ISSUE_CREATED) { if (type == Notification.ISSUE_CREATED) {
priority = 1; priority = 1;
@@ -93,14 +90,12 @@ class GotifyAgent
} }
for (const extra of payload.extra ?? []) { for (const extra of payload.extra ?? []) {
message += `\n\n**${extra.name}**\n${extra.value} `; message += `\n\n**${extra.name}**\n${extra.value}`;
} }
if (applicationUrl && payload.media) { if (applicationUrl && payload.media) {
const actionUrl = `${applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`; const actionUrl = `${applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
const displayUrl = message += `\n\nOpen in ${applicationTitle}(${actionUrl})`;
actionUrl.length > 40 ? `${actionUrl.slice(0, 41)}...` : actionUrl;
message += `\n\n**Open in ${applicationTitle}:** [${displayUrl}](${actionUrl}) `;
} }
return { return {

View File

@@ -217,7 +217,7 @@ const TvRequestModal = ({
mediaType: 'tv', mediaType: 'tv',
is4k, is4k,
seasons: settings.currentSettings.partialRequestsEnabled seasons: settings.currentSettings.partialRequestsEnabled
? selectedSeasons.sort((a, b) => a - b) ? selectedSeasons
: getAllSeasons().filter( : getAllSeasons().filter(
(season) => !getAllRequestedSeasons().includes(season) (season) => !getAllRequestedSeasons().includes(season)
), ),

View File

@@ -415,7 +415,7 @@ const UserGeneralSettings = () => {
</span> </span>
</label> </label>
<div className="form-input-area"> <div className="form-input-area">
<div className="form-input-field relative z-[22]"> <div className="form-input-field relative z-30">
<RegionSelector <RegionSelector
name="discoverRegion" name="discoverRegion"
value={values.discoverRegion ?? ''} value={values.discoverRegion ?? ''}
@@ -433,7 +433,7 @@ const UserGeneralSettings = () => {
</span> </span>
</label> </label>
<div className="form-input-area"> <div className="form-input-area">
<div className="form-input-field relative z-[21]"> <div className="form-input-field">
<LanguageSelector <LanguageSelector
setFieldValue={setFieldValue} setFieldValue={setFieldValue}
serverValue={currentSettings.originalLanguage} serverValue={currentSettings.originalLanguage}