mirror of
https://github.com/fallenbagel/jellyseerr.git
synced 2025-12-24 02:39:18 -05:00
fix(jellyfin): use the same deviceId for admins (#1710)
* fix(jellyfin): use the same deviceId for admins This PR will make Jellyseerr use the same deviceId for the admin user everytime he logins to Jellyfin/Emby. The previous behavior with different deviceId was creating new entries on the media at every request. * fix: remove useless check
This commit is contained in:
@@ -130,9 +130,7 @@ class JellyfinAPI extends ExternalAPI {
|
||||
const safeDeviceId =
|
||||
deviceId && deviceId.length > 0
|
||||
? deviceId
|
||||
: Buffer.from(`BOT_jellyseerr_fallback_${Date.now()}`).toString(
|
||||
'base64'
|
||||
);
|
||||
: Buffer.from('BOT_jellyseerr').toString('base64');
|
||||
|
||||
let authHeaderVal: string;
|
||||
if (authToken) {
|
||||
|
||||
@@ -277,11 +277,14 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
|
||||
select: { id: true, jellyfinDeviceId: true },
|
||||
});
|
||||
|
||||
let deviceId = '';
|
||||
if (user) {
|
||||
deviceId = user.jellyfinDeviceId ?? '';
|
||||
} else {
|
||||
deviceId = Buffer.from(`BOT_jellyseerr_${body.username ?? ''}`).toString(
|
||||
let deviceId = 'BOT_jellyseerr';
|
||||
if (user && user.id === 1) {
|
||||
// Admin is always BOT_jellyseerr
|
||||
deviceId = 'BOT_jellyseerr';
|
||||
} else if (user && user.jellyfinDeviceId) {
|
||||
deviceId = user.jellyfinDeviceId;
|
||||
} else if (body.username) {
|
||||
deviceId = Buffer.from(`BOT_jellyseerr_${body.username}`).toString(
|
||||
'base64'
|
||||
);
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ async function initAvatarImageProxy() {
|
||||
select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
|
||||
order: { id: 'ASC' },
|
||||
});
|
||||
const deviceId = admin?.jellyfinDeviceId;
|
||||
const deviceId = admin?.jellyfinDeviceId || 'BOT_jellyseerr';
|
||||
const authToken = getSettings().jellyfin.apiKey;
|
||||
_avatarImageProxy = new ImageProxy('avatar', '', {
|
||||
headers: {
|
||||
|
||||
@@ -421,7 +421,9 @@ userSettingsRoutes.post<{ username: string; password: string }>(
|
||||
|
||||
const hostname = getHostname();
|
||||
const deviceId = Buffer.from(
|
||||
`BOT_jellyseerr_${req.user.username ?? ''}`
|
||||
req.user?.id === 1
|
||||
? 'BOT_jellyseerr'
|
||||
: `BOT_jellyseerr_${req.user.username ?? ''}`
|
||||
).toString('base64');
|
||||
|
||||
const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
|
||||
|
||||
Reference in New Issue
Block a user