remove test build

.editorconfig

@@ -1,7 +0,0 @@
-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 --target compile .
+        run: docker build .

.gitea/workflows/docker-build.yaml

@@ -11,6 +11,7 @@ env:
 jobs:
   build-docker-image:
     runs-on: ubuntu-latest
+      #if: gitea.ref == 'refs/heads/master'
     container: catthehacker/ubuntu:act-latest
     permissions:
       contents: read
@@ -21,8 +22,6 @@ 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 --target compile -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" .
-        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

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

jest.config.js

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

package-lock.json

@@ -30,13 +30,12 @@
         "winston": "^3.8.2"
       },
       "devDependencies": {
-				"@types/jest": "^29.5.2",
+        "@types/jest": "^29.5.0",
         "@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"
@@ -1569,9 +1568,9 @@
       }
     },
     "node_modules/@types/jest": {
-			"version": "29.5.2",
+      "version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.0.tgz",
-			"integrity": "sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==",
+      "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==",
       "dev": true,
       "dependencies": {
         "expect": "^29.0.0",
@@ -4990,12 +4989,6 @@
         "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",
@@ -8146,9 +8139,9 @@
       }
     },
     "@types/jest": {
-			"version": "29.5.2",
+      "version": "29.5.0",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.0.tgz",
-			"integrity": "sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==",
+      "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==",
       "dev": true,
       "requires": {
         "expect": "^29.0.0",
@@ -10727,12 +10720,6 @@
       "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,18 +33,15 @@
     "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 --runInBand",
-		"test-watch": "jest --watch"
   },
   "devDependencies": {
-		"@types/jest": "^29.5.2",
+    "@types/jest": "^29.5.0",
     "@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/logger.ts

@@ -1,8 +1,5 @@
 import { createLogger, format, transports } from "winston"
 import { config } from "./configuration"
-import { v4 } from "uuid"
-export function newRequestId() { return v4() }
-export const noGuildId = 'NoGuildId'
 
 
 const printFn = format.printf(({ guildId, level, message, errorCode, requestId, timestamp: logTimestamp }: { [k: string]: string }) => {
@@ -16,8 +13,7 @@ const logFormat = format.combine(
 
 const consoleTransports = [
   new transports.Console({
-		format: logFormat,
+    format: logFormat
-		silent: process.env.NODE_ENV === 'testing'
   })
 ]
 export const logger = createLogger({

tests/helpers/date.test.ts

@@ -1,16 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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)
-})

tests/testenv.js

@@ -1,15 +0,0 @@
-process.env.CLIENT_ID = "CLIENT_ID"
-process.env.SECRET = "SECRET"
-process.env.BOT_TOKEN = "BOT_TOKEN"
-process.env.WATCHER_ROLE = "WATCHER_ROLE"
-process.env.ADMIN_ROLE = "ADMIN_ROLE"
-process.env.CHANNEL_ID = "CHANNEL_ID"
-process.env.WATCHPARTY_ANNOUNCEMENT_ROLE = "WATCHPARTY_ANNOUNCEMENT_ROLE"
-process.env.YAVIN_JELLYFIN_URL = "YAVIN_JELLYFIN_URL"
-process.env.YAVIN_COLLECTION_ID = "YAVIN_COLLECTION_ID"
-process.env.YAVIN_COLLECTION_USER = "YAVIN_COLLECTION_USER"
-process.env.YAVIN_TOKEN = "YAVIN_TOKEN"
-process.env.TOKEN = "TOKEN"
-process.env.JELLYFIN_USER = "JELLYFIN_USER"
-process.env.JELLYFIN_COLLECTION_ID = "JELLYFIN_COLLECTION_ID"
-process.env.JELLYFIN_URL = "JELLYFIN_URL"

tsconfig.json

@@ -1,44 +1,61 @@
 {
 	"extends":"@tsconfig/recommended/tsconfig.json",
-	"exclude": [
+	"exclude":["node_modules"],
-		"node_modules"
-	],
   "compilerOptions": {
     /* Basic Options */
     "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
     "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
     "resolveJsonModule": true,
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
     "outDir": "./build" /* Redirect output structure to the directory. */,
     // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
     // "composite": true,                     /* Enable project compilation */
-		"removeComments": true,                /* Do not emit comments to output. */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
     /* Strict Type-Checking Options */
     "strict": true /* Enable all strict type-checking options. */,
-		"noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-		"strictNullChecks": true, /* Enable strict null checks. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
-		"strictFunctionTypes": true, /* Enable strict checking of function types. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
     // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
     // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
     // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-		"alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
-		//"noUncheckedIndexedAccess": true,
+
     /* Additional Checks */
     // "noUnusedLocals": true,                /* Report errors on unused locals. */
     // "noUnusedParameters": true,            /* Report errors on unused parameters. */
     // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
     // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
     /* Module Resolution Options */
     "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
     "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
     /* Source Map Options */
     // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
     // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
     "inlineSourceMap": true /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
     /* Experimental Options */
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */