Merge pull request 'feat/formatting' (#53) from feat/formatting into master

Reviewed-on: #53

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+[*]
+indent_style = tab
+tab_width = 4
+[*.ts]
+indent_style = tab
+tab_width = 4

.gitea/workflows/compile.yaml

@@ -14,4 +14,4 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Build Container
-        run: docker build .
+        run: docker build --target compile .

.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 --target compile -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 }}"

.gitea/workflows/test.yaml

@@ -0,0 +1,18 @@
+name: Run unit tests
+on: [pull_request]
+env:
+  REGISTRY: gitea.brudi.xyz
+  IMAGE_NAME: ${{ gitea.repository }}
+  USER: ${{ gitea.actor }}
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    container: catthehacker/ubuntu:act-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Run Tests
+        run: docker build --target test .
+

Dockerfile

@@ -1,11 +1,21 @@
-FROM node:alpine as Build
+FROM node:alpine as files 
-ENV NODE_ENV=production
+ENV TZ="Europe/Berlin"
 WORKDIR /app
-
 COPY [ "package-lock.json", "package.json", "index.ts", "tsconfig.json", "./" ]
 COPY server ./server
 
+FROM files as proddependencies
+ENV NODE_ENV=production
 RUN npm ci --omit=dev
 
+FROM proddependencies as compile 
 RUN npm run build
 CMD ["npm","run","start"]
+
+FROM files as dependencies
+RUN npm ci
+
+FROM dependencies as test
+COPY jest.config.js .
+COPY tests ./tests
+RUN npm run test

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 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 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)
 

jest.config.js

@@ -0,0 +1,18 @@
+module.exports = {
+  'roots': [
+    '<rootDir>/tests',
+    '<rootDir>/server'
+  ],
+  'transform': {
+    '^.+\\.tsx?$': 'ts-jest'
+  },
+  'testRegex': '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
+  'moduleFileExtensions': [
+    'ts',
+    'tsx',
+    'js',
+    'jsx',
+    'json',
+    'node'
+  ],
+};

package-lock.json

@@ -30,12 +30,13 @@
         "winston": "^3.8.2"
       },
       "devDependencies": {
-        "@types/jest": "^29.5.0",
+        "@types/jest": "^29.5.2",
         "@typescript-eslint/eslint-plugin": "^5.58.0",
         "@typescript-eslint/parser": "^5.58.0",
         "eslint": "^8.38.0",
         "jest": "^29.5.0",
         "jest-cli": "^29.5.0",
+        "mockdate": "^3.0.5",
         "nodemon": "^2.0.22",
         "rimraf": "^5.0.0",
         "ts-jest": "^29.1.0"
@@ -1568,9 +1569,9 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.0",
+      "version": "29.5.2",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.2.tgz",
-      "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==",
+      "integrity": "sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==",
       "dev": true,
       "dependencies": {
         "expect": "^29.0.0",
@@ -4989,6 +4990,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/mockdate": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz",
+      "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==",
+      "dev": true
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -8139,9 +8146,9 @@
       }
     },
     "@types/jest": {
-      "version": "29.5.0",
+      "version": "29.5.2",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.2.tgz",
-      "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==",
+      "integrity": "sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==",
       "dev": true,
       "requires": {
         "expect": "^29.0.0",
@@ -10720,6 +10727,12 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
     },
+    "mockdate": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz",
+      "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==",
+      "dev": true
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

package.json

@@ -33,15 +33,18 @@
     "debuggable": "node build/index.js --inspect-brk",
     "monitor": "nodemon build/index.js",
     "lint": "eslint . --ext .ts",
-    "lint-fix": "eslint . --ext .ts --fix"
+    "lint-fix": "eslint . --ext .ts --fix",
+    "test": "jest",
+    "test-watch": "jest --watch"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^29.5.2",
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
     "eslint": "^8.38.0",
     "jest": "^29.5.0",
     "jest-cli": "^29.5.0",
+    "mockdate": "^3.0.5",
     "nodemon": "^2.0.22",
     "rimraf": "^5.0.0",
     "ts-jest": "^29.1.0"

server/commands/announce.ts

@@ -13,22 +13,22 @@ export default new Command({
 	options: [{
 		name: "typ",
 		type: ApplicationCommandOptionType.String,
-        description:"Was für ein announcement?",
+		description: "Was für ein announcement?",
-        choices: [{name: "initial", value:"initial"},{name: "votepls", value:"votepls"},{name: "cancel", value:"cancel"}],
+		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) {
+		if (!command.guildId) {
-            logger.error("COMMAND DOES NOT HAVE A GUILD ID; CANCELLING!!!", {requestId})
+			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 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 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) {
+		if (!event.scheduledStartAt) {
-            logger.info("EVENT DOES NOT HAVE STARTDATE; CANCELLING", {guildId: event.guildId, requestId})
+			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,23 +1,23 @@
 import { format, isToday, toDate } from "date-fns";
-import {utcToZonedTime} from "date-fns-tz"
+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) {
+	if (!event.scheduledStartAt) {
-        logger.error("Event has no start. Cannot create dateString.", {guildId, requestId})
+		logger.error("Event has no start. Cannot create dateString.", { guildId, requestId })
 		return `"habe keinen Startzeitpunkt ermitteln können"`
 	}
 
 	const timeZone = 'Europe/Berlin'
 	const zonedDateTime = utcToZonedTime(event.scheduledStartAt, timeZone)
-    const time = format(zonedDateTime, "HH:mm", {locale: de})
+	const time = format(zonedDateTime, "HH:mm", { locale: de })
 
-    if(isToday(zonedDateTime)) {
+	if (isToday(zonedDateTime)) {
 		return `heute um ${time}`
 	}
 
-    const date = format(zonedDateTime, "eeee dd.MM", {locale: de})
+	const date = format(zonedDateTime, "eeee dd.MM", { locale: de })
 	return `am ${date} um ${time}`
 }

server/jellyfin/handler.ts

@@ -64,7 +64,7 @@ export class JellyfinHandler {
 		logger.debug(JSON.stringify(req), { requestId, guildId })
 		const createResult = await this.userApi.createUserByName(req)
 		if (createResult) {
-      if(createResult.policy) {
+			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}"!`)
@@ -74,8 +74,8 @@ export class JellyfinHandler {
 	}
 
 	public async setUserPermissions(user: UserDto, requestId: string, guildId?: string) {
-    if(!user.policy || !user.id) {
+		if (!user.policy || !user.id) {
-      logger.error(`Cannot update user policy. User ${user.name} has no policy to modify`, {guildId, requestId}) 
+			logger.error(`Cannot update user policy. User ${user.name} has no policy to modify`, { guildId, requestId })
 			return
 		}
 		user.policy.enableVideoPlaybackTranscoding = false
@@ -273,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])))
 		}
 	}

tests/helpers/date.test.ts

@@ -0,0 +1,16 @@
+import { GuildScheduledEvent } from "discord.js"
+import { createDateStringFromEvent } from "../../server/helper/dateHelper"
+import MockDate from 'mockdate'
+
+beforeAll(() => {
+  MockDate.set('01-01-2023')
+})
+
+function getTestDate(date: string): GuildScheduledEvent {
+  return <GuildScheduledEvent>{ scheduledStartAt: new Date(date) }
+}
+test('createDateStringFromEvent - correct formatting', () => {
+  expect(createDateStringFromEvent(getTestDate('01-01-2023 12:30'), "")).toEqual('heute um 12:30')
+  expect(createDateStringFromEvent(getTestDate('01-02-2023 12:30'), "")).toEqual('am Montag 02.01 um 12:30')
+  expect(createDateStringFromEvent(getTestDate('01-03-2023 12:30'), "")).toEqual('am Dienstag 03.01 um 12:30')
+})

tests/helpers/memberRoles.test.ts

@@ -0,0 +1,28 @@
+import { Collection, GuildMember, Role } from "discord.js"
+import { filterRolesFromMemberUpdate } from "../../server/helper/roleFilter"
+
+function buildFakeRole(id: string, name: string): Role {
+  return <Role>{ id, name }
+
+}
+test('filterRolesFromMemberUpdate', () => {
+  const oldMemberRoles: Collection<string, Role> = new Collection<string, Role>()
+  oldMemberRoles.set('1', buildFakeRole('01', 'Role01'))
+  oldMemberRoles.set('2', buildFakeRole('02', 'Role02'))
+
+  const newMemberRoles: Collection<string, Role> = new Collection<string, Role>()
+  newMemberRoles.set('1', buildFakeRole('01', 'Role01'))
+  newMemberRoles.set('2', buildFakeRole('02', 'Role02'))
+  newMemberRoles.set('3', buildFakeRole('03', 'Role03'))
+
+  const oldMember: GuildMember = <GuildMember>{ roles: { cache: oldMemberRoles }, guild: { id: "guildid" } }
+  const newMember: GuildMember = <GuildMember>{ roles: { cache: newMemberRoles }, guild: { id: "guildid" } }
+  const output = filterRolesFromMemberUpdate(oldMember, newMember)
+
+  const expectedAddedRoles: Collection<string, Role> = new Collection<string, Role>()
+  expectedAddedRoles.set('3', buildFakeRole('03', 'Role03'))
+  const expectedRemovedRoles: Collection<string, Role> = new Collection<string, Role>()
+
+  expect(output.addedRoles).toEqual(expectedAddedRoles)
+  expect(output.removedRoles).toEqual(expectedRemovedRoles)
+})