mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2025-12-23 18:29:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: improve display name sanitization in tag creation

Browse Source
This commit is contained in:
fallenbagel
2025-12-17 01:38:19 +08:00
parent c0ccd90468
commit c50b45592e
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/lib/settings/migrations/0007_migrate_arr_tags.ts
View File

@@ -47,7 +47,9 @@ const migrationArrTags = async (settings: any): Promise<AllSettings> => {
.normalize('NFD') .normalize('NFD')
.replace(/[\u0300-\u036f]/g, '') .replace(/[\u0300-\u036f]/g, '')
.replace(/\s+/g, '-') .replace(/\s+/g, '-')
.replace(/[^a-z0-9-]/gi, ''), .replace(/[^a-z0-9-]/gi, '')
.replace(/-+/g, '-')
.replace(/^-|-$/g, ''),
}); });
} }
} catch (error) { } catch (error) {
@@ -87,7 +89,9 @@ const migrationArrTags = async (settings: any): Promise<AllSettings> => {
.normalize('NFD') .normalize('NFD')
.replace(/[\u0300-\u036f]/g, '') .replace(/[\u0300-\u036f]/g, '')
.replace(/\s+/g, '-') .replace(/\s+/g, '-')
.replace(/[^a-z0-9-]/gi, ''), .replace(/[^a-z0-9-]/gi, '')
.replace(/-+/g, '-')
.replace(/^-|-$/g, ''),
}); });
} }
} catch (error) { } catch (error) {

34
server/subscriber/MediaRequestSubscriber.ts
View File

@@ -29,6 +29,16 @@ import type {
} from 'typeorm'; } from 'typeorm';
import { EventSubscriber } from 'typeorm'; import { EventSubscriber } from 'typeorm';
const sanitizeDisplayName = (displayName: string): string => {
return displayName
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.replace(/\s+/g, '-')
.replace(/[^a-z0-9-]/gi, '')
.replace(/-+/g, '-')
.replace(/^-|-$/g, '');
};
@EventSubscriber() @EventSubscriber()
export class MediaRequestSubscriber export class MediaRequestSubscriber
implements EntitySubscriberInterface<MediaRequest> implements EntitySubscriberInterface<MediaRequest>
@@ -312,21 +322,13 @@ export class MediaRequestSubscriber
newTag: newTag:
entity.requestedBy.id + entity.requestedBy.id +
'-' + '-' +
entity.requestedBy.displayName sanitizeDisplayName(entity.requestedBy.displayName),
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.replace(/\s+/g, '-')
.replace(/[^a-z0-9-]/gi, ''),
}); });
userTag = await radarr.createTag({ userTag = await radarr.createTag({
label: label:
entity.requestedBy.id + entity.requestedBy.id +
'-' + '-' +
entity.requestedBy.displayName sanitizeDisplayName(entity.requestedBy.displayName),
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.replace(/\s+/g, '-')
.replace(/[^a-z0-9-]/gi, ''),
}); });
} }
if (userTag.id) { if (userTag.id) {
@@ -645,21 +647,13 @@ export class MediaRequestSubscriber
newTag: newTag:
entity.requestedBy.id + entity.requestedBy.id +
'-' + '-' +
entity.requestedBy.displayName sanitizeDisplayName(entity.requestedBy.displayName),
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.replace(/\s+/g, '-')
.replace(/[^a-z0-9-]/gi, ''),
}); });
userTag = await sonarr.createTag({ userTag = await sonarr.createTag({
label: label:
entity.requestedBy.id + entity.requestedBy.id +
'-' + '-' +
entity.requestedBy.displayName sanitizeDisplayName(entity.requestedBy.displayName),
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
.replace(/\s+/g, '-')
.replace(/[^a-z0-9-]/gi, ''),
}); });
} }
if (userTag.id) { if (userTag.id) {