Merge pull request 'feat/#43_append_event_invite' (#49) from feat/#43_append_event_invite into master

Reviewed-on: #49

.gitea/workflows/compile.yaml

@@ -1,5 +1,5 @@
 name: Compile the repository
-on: [push]
+on: [pull_request]
 env:
   REGISTRY: gitea.brudi.xyz
   IMAGE_NAME: ${{ gitea.repository }}
@@ -14,4 +14,4 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Build Container
-        run: docker build -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" .
+        run: docker build .

.gitea/workflows/docker-build.yaml

@@ -11,7 +11,7 @@ env:
 jobs:
   build-docker-image:
     runs-on: ubuntu-latest
-    if: gitea.ref == 'refs/heads/master'
+      #if: gitea.ref == 'refs/heads/master'
     container: catthehacker/ubuntu:act-latest
     permissions:
       contents: read
@@ -19,11 +19,9 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-      - name: Get Package Version
-        run: VERSION = node -p "require('./package.json').version"
       - 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" -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}".
+        run: docker build -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" -t "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ node -p "require('./package.json').version" }}".
       - name: Push Container
-        run: docker push "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
+        run: docker push --all-tags "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "node-jellyfin-discord-bot",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "node-jellyfin-discord-bot",
-      "version": "1.0.1",
+      "version": "1.0.4",
       "license": "MIT",
       "dependencies": {
         "@discordjs/rest": "^1.7.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-jellyfin-discord-bot",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "A discord bot to sync jellyfin accounts with discord roles",
   "main": "index.js",
   "license": "MIT",

server/commands/closepoll.ts

@@ -75,7 +75,7 @@ export async function closePoll(guild: Guild, requestId: string) {
 async function sendVoteClosedMessage(event: GuildScheduledEvent, movie: string, guildId: string, requestId: string) {
     const date = event.scheduledStartAt ? format(event.scheduledStartAt, "dd.MM") : "Fehler, event hatte kein Datum"
     const time = event.scheduledStartAt ? format(event.scheduledStartAt, "HH:mm") : "Fehler, event hatte kein Datum"
-    const body = `[Abstimmung beendet] <@&${config.bot.announcement_role}> Wir gucken  ${movie} am ${date} um ${time}`
+    const body = `[Abstimmung beendet] für https://discord.com/events/${event.guildId}/${event.id}\n<@&${config.bot.announcement_role}> Wir gucken  ${movie} am ${date} um ${time}`
     const options: MessageCreateOptions = {
         content: body,
         allowedMentions: { parse: ["roles"] }

server/events/guildScheduledEventCreate.ts

@@ -11,6 +11,7 @@ import { logger } from "../logger";
 export const name = 'guildScheduledEventCreate'
 
 export enum Emotes { "1️⃣", "2️⃣", "3️⃣", "4️⃣", "5️⃣", "6️⃣", "7️⃣", "8️⃣", "9️⃣", "🔟" }
+export const NONE_OF_THAT = "❌"
 
 export let task: ScheduledTask | undefined
 
@@ -40,15 +41,16 @@ export async function execute(event: GuildScheduledEvent) {
         }
         const date = format(event.scheduledStartAt, "dd.MM")
         const time = format(event.scheduledStartAt, "HH:mm")
-        let message = `[Abstimmung]\n<@&${config.bot.announcement_role}> Es gibt eine neue Abstimmung für die nächste Watchparty am ${date} um ${time}}! Stimme hierunter für den nächsten Film ab!\n`
+        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 am ${date} um ${time}! Stimme hierunter für den nächsten Film ab!\n`
 
         for (let i = 0; i < movies.length; i++) {
             message = message.concat(Emotes[i]).concat(": ").concat(movies[i]).concat("\n")
         }
+        message = message.concat(NONE_OF_THAT).concat(": Wenn dir nichts davon gefällt.")
 
         const options: MessageCreateOptions = {
             allowedMentions: { parse: ["roles"]},
-            content: message
+            content: message,
         }
 
         const sentMessage: Message<true> = await (await announcementChannel.fetch()).send(options)
@@ -56,6 +58,7 @@ export async function execute(event: GuildScheduledEvent) {
         for (let i = 0; i < movies.length; i++) {
             sentMessage.react(Emotes[i])
         }
+        sentMessage.react(NONE_OF_THAT)
 
         // sentMessage.pin() //todo: uncomment when bot has permission to pin messages. Also update closepoll.ts to only fetch pinned messages
     }