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

fix(import all): fis for import all

Browse Source
This commit is contained in:
Nicolai Van der Storm
2022-06-13 23:13:22 +02:00
parent a483ca9837
commit 29478fc195
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server/routes/user/index.ts
View File

@@ -1,6 +1,6 @@
import { Router } from 'express'; import { Router } from 'express';
import gravatarUrl from 'gravatar-url'; import gravatarUrl from 'gravatar-url';
import { findIndex, forEach, sortBy } from 'lodash'; import { findIndex, sortBy } from 'lodash';
import { getRepository, In, Not } from 'typeorm'; import { getRepository, In, Not } from 'typeorm';
import JellyfinAPI from '../../api/jellyfin'; import JellyfinAPI from '../../api/jellyfin';
import PlexTvAPI from '../../api/plextv'; import PlexTvAPI from '../../api/plextv';
@@ -500,9 +500,13 @@ router.post(
? externalHostname ? externalHostname
: hostname; : hostname;
forEach(body.jellyfinUserIds, async (jellyfinUserId) => { jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
jellyfinClient.setUserId(jellyfinUserId); const jellyfinUsers = await jellyfinClient.getUsers();
const jellyfinUser = await jellyfinClient.getUser();
for (const jellyfinUserId of body.jellyfinUserIds) {
const jellyfinUser = jellyfinUsers.users.find(
(user) => user.Id === jellyfinUserId
);
const user = await userRepository.findOne({ const user = await userRepository.findOne({
select: ['id', 'jellyfinUserId'], select: ['id', 'jellyfinUserId'],
@@ -511,14 +515,14 @@ router.post(
if (!user) { if (!user) {
const newUser = new User({ const newUser = new User({
jellyfinUsername: jellyfinUser.Name, jellyfinUsername: jellyfinUser?.Name,
jellyfinUserId: jellyfinUser.Id, jellyfinUserId: jellyfinUser?.Id,
jellyfinDeviceId: Buffer.from( jellyfinDeviceId: Buffer.from(
`BOT_jellyseerr_${jellyfinUser.Name ?? ''}` `BOT_jellyseerr_${jellyfinUser?.Name ?? ''}`
).toString('base64'), ).toString('base64'),
email: jellyfinUser.Name, email: jellyfinUser?.Name,
permissions: settings.main.defaultPermissions, permissions: settings.main.defaultPermissions,
avatar: jellyfinUser.PrimaryImageTag avatar: jellyfinUser?.PrimaryImageTag
? `${jellyfinHost}/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90` ? `${jellyfinHost}/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90`
: '/os_logo_square.png', : '/os_logo_square.png',
userType: UserType.JELLYFIN, userType: UserType.JELLYFIN,
@@ -527,9 +531,8 @@ router.post(
await userRepository.save(newUser); await userRepository.save(newUser);
createdUsers.push(newUser); createdUsers.push(newUser);
} }
}
return res.status(201).json(User.filterMany(createdUsers)); return res.status(201).json(User.filterMany(createdUsers));
});
} catch (e) { } catch (e) {
next({ status: 500, message: e.message }); next({ status: 500, message: e.message });
} }