kenobi/jellyfin-discord-bot
2
1
Fork 0
Code Issues 17 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: kenobi:690ba697b6f2fbfcef3d5a7cdeaaebffebf8ac3b
Branches Tags
kenobi:master
kenobi:feat/20-reactions-for-roles
kenobi:feat/cicd
kenobi:v1.1.4
kenobi:v1.1.3
kenobi:v1.1.2
kenobi:v1.1.1
kenobi:v1.1.0
kenobi:v1.0.4
kenobi:v1.0.3
kenobi:v1.0.2
kenobi:v1.0.1
kenobi:v1.0.0
..
compare: kenobi:0d3c62c6ad34c38bf4eb95fd7c25bd703553c56c
Branches Tags
kenobi:feat/20-reactions-for-roles
kenobi:master
kenobi:feat/cicd
kenobi:v1.1.4
kenobi:v1.1.3
kenobi:v1.1.2
kenobi:v1.1.1
kenobi:v1.1.0
kenobi:v1.0.4
kenobi:v1.0.3
kenobi:v1.0.2
kenobi:v1.0.1
kenobi:v1.0.0

No commits in common. "690ba697b6f2fbfcef3d5a7cdeaaebffebf8ac3b" and "0d3c62c6ad34c38bf4eb95fd7c25bd703553c56c" have entirely different histories.
690ba697b6 ... 0d3c62c6ad

7 changed files with 12245 additions and 12249 deletions
Show Stats Expand all files Collapse all files

3
Dockerfile
View File

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

33
jest.config.js
View File

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

24230
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

102
package.json
View File

@ -1,52 +1,52 @@
{ {
"name": "node-jellyfin-discord-bot", "name": "node-jellyfin-discord-bot",
"version": "1.1.3", "version": "1.1.3",
"description": "A discord bot to sync jellyfin accounts with discord roles", "description": "A discord bot to sync jellyfin accounts with discord roles",
"main": "index.js", "main": "index.js",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@discordjs/rest": "^1.7.0", "@discordjs/rest": "^1.7.0",
"@tsconfig/recommended": "^1.0.2", "@tsconfig/recommended": "^1.0.2",
"@types/node": "^18.15.11", "@types/node": "^18.15.11",
"@types/node-cron": "^3.0.7", "@types/node-cron": "^3.0.7",
"@types/request": "^2.48.8", "@types/request": "^2.48.8",
"@types/uuid": "^9.0.1", "@types/uuid": "^9.0.1",
"axios": "^1.3.5", "axios": "^1.3.5",
"date-fns": "^2.29.3", "date-fns": "^2.29.3",
"date-fns-tz": "^2.0.0", "date-fns-tz": "^2.0.0",
"discord-api-types": "^0.37.38", "discord-api-types": "^0.37.38",
"discord.js": "^14.9.0", "discord.js": "^14.9.0",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"jellyfin-apiclient": "^1.10.0", "jellyfin-apiclient": "^1.10.0",
"node-cron": "^3.0.2", "node-cron": "^3.0.2",
"sqlite3": "^5.1.6", "sqlite3": "^5.1.6",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "^5.0.4", "typescript": "^5.0.4",
"uuid": "^9.0.0", "uuid": "^9.0.0",
"winston": "^3.8.2" "winston": "^3.8.2"
}, },
"scripts": { "scripts": {
"build": "tsc", "build": "tsc",
"buildwatch": "tsc --watch", "buildwatch": "tsc --watch",
"clean": "rimraf build", "clean": "rimraf build",
"start": "node build/index.js", "start": "node build/index.js",
"debuggable": "node build/index.js --inspect-brk", "debuggable": "node build/index.js --inspect-brk",
"monitor": "nodemon build/index.js", "monitor": "nodemon build/index.js",
"lint": "eslint . --ext .ts", "lint": "eslint . --ext .ts",
"lint-fix": "eslint . --ext .ts --fix", "lint-fix": "eslint . --ext .ts --fix",
"test": "jest --runInBand", "test": "jest",
"test-watch": "jest --watch" "test-watch": "jest --watch"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^29.5.2", "@types/jest": "^29.5.2",
"@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/eslint-plugin": "^5.58.0",
"@typescript-eslint/parser": "^5.58.0", "@typescript-eslint/parser": "^5.58.0",
"eslint": "^8.38.0", "eslint": "^8.38.0",
"jest": "^29.5.0", "jest": "^29.5.0",
"jest-cli": "^29.5.0", "jest-cli": "^29.5.0",
"mockdate": "^3.0.5", "mockdate": "^3.0.5",
"nodemon": "^2.0.22", "nodemon": "^2.0.22",
"rimraf": "^5.0.0", "rimraf": "^5.0.0",
"ts-jest": "^29.1.0" "ts-jest": "^29.1.0"
} }
} }

6
server/logger.ts
View File

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

15
tests/testenv.js
View File

@ -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"

105
tsconfig.json
View File

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