apply editorconfig to ts files

Reviewed-on: #51

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+[*]
+indent_size = 2
+indent_style = space
+[*.ts]
+indent_size = 2
+indent_style = space

.gitea/workflows/docker-build.yaml

@@ -11,7 +11,6 @@ env:
 jobs:
   build-docker-image:
     runs-on: ubuntu-latest
-      #if: gitea.ref == 'refs/heads/master'
     container: catthehacker/ubuntu:act-latest
     permissions:
       contents: read
@@ -22,6 +21,8 @@ jobs:
       - name: Log in to the Container registry
         run: docker login -u ${{ env.USER }} -p ${{ secrets.TOKEN }} ${{ env.REGISTRY }}
       - name: Build Container
-        run: docker build -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" .
+        run: docker build -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}" .
+        env:
+          version: $(cat package.json | awk 'match($0, /version/) {print $2}' | sed 's/[\",]//g') # extracts the version number from the package.json with bash magic
       - name: Push Container
         run: docker push --all-tags "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"

index.ts

@@ -5,8 +5,8 @@ import { JellyfinHandler } from "./server/jellyfin/handler"
 import { attachedImages } from "./server/assets/attachments"
 const requestId = 'startup'
 
-export const jellyfinHandler = new JellyfinHandler({jellyfinToken: config.bot.workaround_token, jellyfinUrl: config.bot.jellyfin_url, movieCollectionId: config.bot.jf_collection_id, collectionUser: config.bot.jf_user})
-export const yavinJellyfinHandler = new JellyfinHandler({jellyfinToken: config.bot.yavin_jellyfin_token, jellyfinUrl: config.bot.yavin_jellyfin_url, movieCollectionId: config.bot.yavin_collection_id, collectionUser: config.bot.yavin_jellyfin_collection_user})
+export const jellyfinHandler = new JellyfinHandler({ jellyfinToken: config.bot.workaround_token, jellyfinUrl: config.bot.jellyfin_url, movieCollectionId: config.bot.jf_collection_id, collectionUser: config.bot.jf_user })
+export const yavinJellyfinHandler = new JellyfinHandler({ jellyfinToken: config.bot.yavin_jellyfin_token, jellyfinUrl: config.bot.yavin_jellyfin_url, movieCollectionId: config.bot.yavin_collection_id, collectionUser: config.bot.yavin_jellyfin_collection_user })
 
 export const client = new ExtendedClient(jellyfinHandler)
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "node-jellyfin-discord-bot",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "node-jellyfin-discord-bot",
-      "version": "1.1.2",
+      "version": "1.1.3",
       "license": "MIT",
       "dependencies": {
         "@discordjs/rest": "^1.7.0",
@@ -17,6 +17,7 @@
         "@types/uuid": "^9.0.1",
         "axios": "^1.3.5",
         "date-fns": "^2.29.3",
+        "date-fns-tz": "^2.0.0",
         "discord-api-types": "^0.37.38",
         "discord.js": "^14.9.0",
         "dotenv": "^16.0.3",
@@ -2626,6 +2627,14 @@
         "url": "https://opencollective.com/date-fns"
       }
     },
+    "node_modules/date-fns-tz": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.0.tgz",
+      "integrity": "sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==",
+      "peerDependencies": {
+        "date-fns": ">=2.0.0"
+      }
+    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -8905,6 +8914,12 @@
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
       "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="
     },
+    "date-fns-tz": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.0.tgz",
+      "integrity": "sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==",
+      "requires": {}
+    },
     "debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-jellyfin-discord-bot",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A discord bot to sync jellyfin accounts with discord roles",
   "main": "index.js",
   "license": "MIT",
@@ -13,6 +13,7 @@
     "@types/uuid": "^9.0.1",
     "axios": "^1.3.5",
     "date-fns": "^2.29.3",
+    "date-fns-tz": "^2.0.0",
     "discord-api-types": "^0.37.38",
     "discord.js": "^14.9.0",
     "dotenv": "^16.0.3",

server/commands/announce.ts

@@ -13,22 +13,22 @@ export default new Command({
   options: [{
     name: "typ",
     type: ApplicationCommandOptionType.String,
-        description:"Was für ein announcement?",
-        choices: [{name: "initial", value:"initial"},{name: "votepls", value:"votepls"},{name: "cancel", value:"cancel"}],
+    description: "Was für ein announcement?",
+    choices: [{ name: "initial", value: "initial" }, { name: "votepls", value: "votepls" }, { name: "cancel", value: "cancel" }],
     required: true
   }],
   run: async (interaction: RunOptions) => {
     const command = interaction.interaction
     const requestId = uuid()
-        if(!command.guildId) {
-            logger.error("COMMAND DOES NOT HAVE A GUILD ID; CANCELLING!!!", {requestId})
+    if (!command.guildId) {
+      logger.error("COMMAND DOES NOT HAVE A GUILD ID; CANCELLING!!!", { requestId })
       return
     }
     const guildId = command.guildId
     const announcementType = command.options.data.find(option => option.name.includes("typ"))
     logger.info(`Got command for announcing ${announcementType?.value}!`, { guildId, requestId })
 
-        if(!announcementType) {
+    if (!announcementType) {
       logger.error("Did not get an announcement type!", { guildId, requestId })
       return
     }
@@ -40,7 +40,7 @@ export default new Command({
       logger.info(`User ${command.member.displayName} seems to be admin`)
     }
 
-        if((<string>announcementType.value).includes("initial")) {
+    if ((<string>announcementType.value).includes("initial")) {
       sendInitialAnnouncement(guildId, requestId)
       command.followUp("Ist rausgeschickt!")
     } else {
@@ -56,7 +56,7 @@ function isAdmin(member: GuildMember): boolean {
 async function sendInitialAnnouncement(guildId: string, requestId: string): Promise<void> {
   logger.info("Sending initial announcement")
   const announcementChannel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(guildId)
-    if(!announcementChannel) {
+  if (!announcementChannel) {
     logger.error("Could not find announcement channel. Aborting", { guildId, requestId })
     return
   }
@@ -96,7 +96,7 @@ export async function manageAnnouncementRoles(guild: Guild, reaction: MessageRea
   const allUsers = (await guild.members.fetch())
 
   const usersWhoHaveRole: GuildMember[] = allUsers
-        .filter(member=> member.roles.cache
+    .filter(member => member.roles.cache
       .find(role => role.id === config.bot.announcement_role) !== undefined)
     .map(member => member)
 
@@ -105,15 +105,15 @@ export async function manageAnnouncementRoles(guild: Guild, reaction: MessageRea
 
   const usersWhoDontHaveRole: GuildMember[] = allUsers
     .filter(member => member.roles.cache
-            .find(role=> role.id === config.bot.announcement_role) === undefined)
+      .find(role => role.id === config.bot.announcement_role) === undefined)
     .map(member => member)
 
   const usersWhoNeedRole: GuildMember[] = usersWhoDontHaveRole
     .filter(userWhoNeeds => usersWhoWantRole.map(wanter => wanter.id).includes(userWhoNeeds.id))
 
 
-    logger.debug(`Theses users will get the role removed: ${JSON.stringify(usersWhoNeedRoleRevoked)}`, {guildId, requestId})
-    logger.debug(`Theses users will get the role added: ${JSON.stringify(usersWhoNeedRole)}`, {guildId, requestId})
+  logger.debug(`Theses users will get the role removed: ${JSON.stringify(usersWhoNeedRoleRevoked)}`, { guildId, requestId })
+  logger.debug(`Theses users will get the role added: ${JSON.stringify(usersWhoNeedRole)}`, { guildId, requestId })
 
   usersWhoNeedRoleRevoked.forEach(user => user.roles.remove(announcementRole))
   usersWhoNeedRole.forEach(user => user.roles.add(announcementRole))

server/events/announceManualWatchparty.ts

@@ -20,7 +20,7 @@ export async function execute(event: GuildScheduledEvent) {
 
     if (event.description.includes("!wp")) {
       logger.info("Got manual create event of watchparty event!", { guildId, requestId })
-            if(event.description.includes("!private")) {
+      if (event.description.includes("!private")) {
         logger.info("Event description contains \"!private\". Won't announce.", { guildId, requestId })
         return
       }

server/events/autoCreateVoteByWPEvent.ts

@@ -28,14 +28,14 @@ export async function execute(event: GuildScheduledEvent) {
     logger.debug(`Movies: ${JSON.stringify(movies)}`, { guildId: event.guildId, requestId })
 
     const announcementChannel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(event.guildId)
-        if(!announcementChannel) {
+    if (!announcementChannel) {
       logger.error("Could not find announcement channel. Aborting", { guildId: event.guildId, requestId })
       return
     }
     logger.debug(`Found channel ${JSON.stringify(announcementChannel, null, 2)}`, { guildId: event.guildId, requestId })
 
-        if(!event.scheduledStartAt) {
-            logger.info("EVENT DOES NOT HAVE STARTDATE; CANCELLING", {guildId: event.guildId, requestId})
+    if (!event.scheduledStartAt) {
+      logger.info("EVENT DOES NOT HAVE STARTDATE; CANCELLING", { guildId: event.guildId, requestId })
       return
     }
     let message = `[Abstimmung] für https://discord.com/events/${event.guildId}/${event.id}\n<@&${config.bot.announcement_role}> Es gibt eine neue Abstimmung für die nächste Watchparty ${createDateStringFromEvent(event, event.guildId, requestId)}! Stimme hierunter für den nächsten Film ab!\n`
@@ -46,7 +46,7 @@ export async function execute(event: GuildScheduledEvent) {
     message = message.concat(NONE_OF_THAT).concat(": Wenn dir nichts davon gefällt.")
 
     const options: MessageCreateOptions = {
-            allowedMentions: { parse: ["roles"]},
+      allowedMentions: { parse: ["roles"] },
       content: message,
     }
 

server/events/deleteAnnouncementsWhenWPEnds.ts

@@ -27,7 +27,7 @@ export async function execute(oldEvent: GuildScheduledEvent, newEvent: GuildSche
 
       const wpAnnouncements = (await announcementChannel.messages.fetch()).filter(message => !message.cleanContent.includes("[initial]"))
       const announcementsWithoutEvent = filterAnnouncementsByPendingWPs(wpAnnouncements, events)
-            logger.info(`Deleting ${announcementsWithoutEvent.length} announcements.`, {guildId, requestId})
+      logger.info(`Deleting ${announcementsWithoutEvent.length} announcements.`, { guildId, requestId })
       announcementsWithoutEvent.forEach(message => message.delete())
     }
   } catch (error) {
@@ -44,7 +44,7 @@ function filterAnnouncementsByPendingWPs(messages: Collection<string, Message<tr
         foundEventForMessage = true
       }
     }
-        if(!foundEventForMessage){
+    if (!foundEventForMessage) {
       filteredMessages.push(message)
     }
   }

server/events/handleTempJFUserByVoiceEvent.ts

@@ -12,7 +12,7 @@ export async function execute(oldState: VoiceState, newState: VoiceState) {
   try {
     logger.info(JSON.stringify(newState, null, 2))
     //ignore events like mute/unmute
-        if(newState.channel?.id === oldState.channel?.id) {
+    if (newState.channel?.id === oldState.channel?.id) {
       logger.info("Not handling VoiceState event because channelid of old and new was the same (i.e. mute/unmute event)")
       return
     }
@@ -21,25 +21,25 @@ export async function execute(oldState: VoiceState, newState: VoiceState) {
       .filter((key) => key.description?.toLowerCase().includes("!wp") && key.isActive())
       .map((key) => key)
 
-        const scheduledEventUsers = (await Promise.all(scheduledEvents.map(event => event.fetchSubscribers({withMember: true}))))
+    const scheduledEventUsers = (await Promise.all(scheduledEvents.map(event => event.fetchSubscribers({ withMember: true }))))
 
     //Dont handle users, that are already subscribed to the event. We only want to handle unsubscribed users here
     let userFound = false;
     scheduledEventUsers.forEach(collection => {
       collection.each(key => {
         logger.info(JSON.stringify(key, null, 2))
-                if(key.member.user.id === newState.member?.user.id)
+        if (key.member.user.id === newState.member?.user.id)
           userFound = true;
       })
     })
-        if(userFound) {
+    if (userFound) {
       logger.info(`Not handling VoiceState event because user was already subscribed and got an account from there. User: ${JSON.stringify(newState.member, null, 2)}`)
       return
     }
 
 
     if (scheduledEvents.find(event => event.channelId === newState.channelId)) {
-            if(newState.member){
+      if (newState.member) {
         logger.info("YO! Da ist jemand dem Channel mit dem Event beigetreten, ich kümmer mich mal um nen Account!")
         const result = await jellyfinHandler.upsertUser(newState.member, "TEMPORARY", uuid())
         if (result === UserUpsertResult.created) {
@@ -53,7 +53,7 @@ export async function execute(oldState: VoiceState, newState: VoiceState) {
     } else {
       logger.info("VoiceState channelId was not the id of any channel with events")
     }
-    }catch(error){
+  } catch (error) {
     logger.error(error)
   }
 }

server/helper/dateHelper.ts

@@ -1,16 +1,23 @@
-import { format } from "date-fns";
+import { format, isToday, toDate } from "date-fns";
+import { utcToZonedTime } from "date-fns-tz"
 import { GuildScheduledEvent } from "discord.js";
 import { logger } from "../logger";
+import de from "date-fns/locale/de";
 
 export function createDateStringFromEvent(event: GuildScheduledEvent, requestId: string, guildId?: string): string {
-    if(!event.scheduledStartAt) {
-        logger.error("Event has no start. Cannot create dateString.", {guildId, requestId})
+  if (!event.scheduledStartAt) {
+    logger.error("Event has no start. Cannot create dateString.", { guildId, requestId })
     return `"habe keinen Startzeitpunkt ermitteln können"`
   }
 
-    const date = format(event.scheduledStartAt, "dd.MM")
-    const time = format(event.scheduledStartAt, "HH:mm")
+  const timeZone = 'Europe/Berlin'
+  const zonedDateTime = utcToZonedTime(event.scheduledStartAt, timeZone)
+  const time = format(zonedDateTime, "HH:mm", { locale: de })
 
+  if (isToday(zonedDateTime)) {
+    return `heute um ${time}`
+  }
 
+  const date = format(zonedDateTime, "eeee dd.MM", { locale: de })
   return `am ${date} um ${time}`
 }

server/jellyfin/handler.ts

@@ -2,7 +2,7 @@ import { GuildMember } from "discord.js";
 import { JellyfinConfig, Maybe, PermissionLevel } from "../interfaces";
 import { logger } from "../logger";
 import { CreateUserByNameOperationRequest, DeleteUserRequest, GetItemsRequest, ItemsApi, SystemApi, UpdateUserPasswordOperationRequest, UpdateUserPolicyOperationRequest, UserApi } from "./apis";
-import { BaseItemDto, UpdateUserPasswordRequest } from "./models";
+import { BaseItemDto, UpdateUserPasswordRequest, UpdateUserPolicyRequest } from "./models";
 import { UserDto } from "./models/UserDto";
 import { Configuration, ConfigurationParameters } from "./runtime";
 
@@ -52,24 +52,46 @@ export class JellyfinHandler {
     return (Math.random() * 10000 + 10000).toFixed(0)
   }
 
-  public async createUserAccountForDiscordUser(discordUser: GuildMember, level: PermissionLevel, guildId?: string, requestId?: string): Promise<UserDto> {
+  public async createUserAccountForDiscordUser(discordUser: GuildMember, level: PermissionLevel, requestId: string, guildId?: string): Promise<UserDto> {
     const newUserName = this.generateJFUserName(discordUser, level)
     logger.info(`New Username for ${discordUser.displayName}: ${newUserName}`, { guildId, requestId })
     const req: CreateUserByNameOperationRequest = {
       createUserByNameRequest: {
         name: newUserName,
-        password: this.generatePasswordForUser(),
+        password: this.generatePasswordForUser()
       }
     }
     logger.debug(JSON.stringify(req), { requestId, guildId })
     const createResult = await this.userApi.createUserByName(req)
     if (createResult) {
+      if (createResult.policy) {
+        this.setUserPermissions(createResult, requestId, guildId)
+      }
       (await discordUser.createDM()).send(`Ich hab dir mal nen Account angelegt :)\nDein Username ist ${createResult.name}, dein Password ist "${req.createUserByNameRequest.password}"!`)
       return createResult
     }
     else throw new Error('Could not create User in Jellyfin')
   }
 
+  public async setUserPermissions(user: UserDto, requestId: string, guildId?: string) {
+    if (!user.policy || !user.id) {
+      logger.error(`Cannot update user policy. User ${user.name} has no policy to modify`, { guildId, requestId })
+      return
+    }
+    user.policy.enableVideoPlaybackTranscoding = false
+
+    const operation: UpdateUserPolicyRequest = {
+      ...user.policy,
+      enableVideoPlaybackTranscoding: false
+    }
+
+    const request: UpdateUserPolicyOperationRequest = {
+      userId: user.id,
+      updateUserPolicyRequest: operation
+    }
+    this.userApi.updateUserPolicy(request)
+  }
+
   public async isUserAlreadyPresent(discordUser: GuildMember, requestId?: string): Promise<boolean> {
     const jfuser = await this.getUser(discordUser, requestId)
     logger.debug(`Presence for DiscordUser ${discordUser.id}:${jfuser !== undefined}`, { guildId: discordUser.guild.id, requestId })
@@ -251,7 +273,7 @@ export class JellyfinHandler {
     let movieCount = 0
     let movieNames: string[]
     do {
-      movieNames = (await this.getRandomMovies(count, guildId, requestId)).filter(movie => movie.name && movie.name.length > 0).map(movie => <string> movie.name)
+      movieNames = (await this.getRandomMovies(count, guildId, requestId)).filter(movie => movie.name && movie.name.length > 0).map(movie => <string>movie.name)
       movieCount = movieNames.length
     } while (movieCount < count)
     return movieNames

server/jellyfin/runtime.ts

@@ -29,7 +29,7 @@ export interface ConfigurationParameters {
 }
 
 export class Configuration {
-    constructor(private configuration: ConfigurationParameters = {}) {}
+  constructor(private configuration: ConfigurationParameters = {}) { }
 
   set config(configuration: Configuration) {
     this.configuration = configuration;
@@ -393,7 +393,7 @@ export interface ResponseTransformer<T> {
 }
 
 export class JSONApiResponse<T> {
-    constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) {}
+  constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) { }
 
   async value(): Promise<T> {
     return this.transformer(await this.raw.json());
@@ -401,7 +401,7 @@ export class JSONApiResponse<T> {
 }
 
 export class VoidApiResponse {
-    constructor(public raw: Response) {}
+  constructor(public raw: Response) { }
 
   async value(): Promise<void> {
     return undefined;
@@ -409,7 +409,7 @@ export class VoidApiResponse {
 }
 
 export class BlobApiResponse {
-    constructor(public raw: Response) {}
+  constructor(public raw: Response) { }
 
   async value(): Promise<Blob> {
     return await this.raw.blob();
@@ -417,7 +417,7 @@ export class BlobApiResponse {
 }
 
 export class TextApiResponse {
-    constructor(public raw: Response) {}
+  constructor(public raw: Response) { }
 
   async value(): Promise<string> {
     return await this.raw.text();

server/structures/client.ts

@@ -130,7 +130,7 @@ export class ExtendedClient extends Client {
     for (const guild of guilds.values()) {
       logger.info("Starting background task for announcement role", { guildId: guild.id })
       const textChannel: Maybe<TextChannel> = this.getAnnouncementChannelForGuild(guild.id)
-      if(!textChannel) {
+      if (!textChannel) {
         logger.error("Could not find announcement channel. Aborting", { guildId: guild.id })
         return
       }
@@ -174,7 +174,7 @@ export class ExtendedClient extends Client {
   }
 
   private async startPollCloseBackgroundTasks() {
-    for(const guild of this.guilds.cache) {
+    for (const guild of this.guilds.cache) {
       this.pollCloseBackgroundTasks.set(guild[1].id, schedule("0 * * * * *", () => checkForPollsToClose(guild[1])))
     }
   }