diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
new file mode 100644
index 00000000..46d9d04d
--- /dev/null
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,47 @@
+name: docker-publish
+
+on:
+ push:
+ branches:
+ - 'master'
+
+jobs:
+ docker:
+ runs-on: ubuntu-latest
+ steps:
+ -
+ name: Checkout
+ uses: actions/checkout@v2
+ -
+ name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v1
+ -
+ name: Cache Docker layers
+ uses: actions/cache@v2
+ with:
+ path: /tmp/.buildx-cache
+ key: ${{ runner.os }}-buildx-${{ github.sha }}
+ restore-keys: |
+ ${{ runner.os }}-buildx-
+ -
+ name: Login to DockerHub
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ -
+ name: Build and push
+ uses: docker/build-push-action@v2
+ with:
+ context: .
+ push: true
+ tags: ${{ secrets.DOCKERHUB_TAGS }}
+ cache-from: type=local,src=/tmp/.buildx-cache
+ cache-to: type=local,dest=/tmp/.buildx-cache-new
+ -
+ # Hackfix to cleanup cache; replace after buildx 0.6 and BuildKit 0.9 are released
+ # https://github.com/docker/build-push-action/pull/406#issuecomment-879184394
+ name: Move cache fix
+ run: |
+ rm -rf /tmp/.buildx-cache
+ mv /tmp/.buildx-cache-new /tmp/.buildx-cache
diff --git a/Dockerfile b/Dockerfile
index 39b4dd56..b1b00a7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,10 @@ FROM node:lts-alpine
RUN apk add --no-cache make gcc g++ python cairo-dev jpeg-dev pango-dev giflib-dev
WORKDIR /usr/src/fosscord-api
COPY package.json .
-RUN npm rebuild bcrypt --build-from-source && npm rebuild canvas --build-from-source
+COPY package-lock.json .
+RUN npm rebuild bcrypt --build-from-source && npm install canvas --build-from-source
RUN npm install
COPY . .
EXPOSE 3001
-RUN npm run build
-CMD ["node", "dist/start.js"]
\ No newline at end of file
+RUN npm run build-docker
+CMD ["node", "dist/start.js"]
diff --git a/package-lock.json b/package-lock.json
index 0849b353..95af52cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
- "@fosscord/server-util": "^1.3.31",
+ "@fosscord/server-util": "^1.3.32",
"@types/jest": "^26.0.22",
"@types/json-schema": "^7.0.7",
"ajv": "^8.4.0",
@@ -677,9 +677,9 @@
}
},
"node_modules/@fosscord/server-util": {
- "version": "1.3.31",
- "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.31.tgz",
- "integrity": "sha512-RTtBOReZA5awzl30djmfZCUn0bjvhyv96S8swWE/z0kG2suSeCOOblirTqYjqjia4ho1hwKqIfg+z3NzNv05xA==",
+ "version": "1.3.32",
+ "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.32.tgz",
+ "integrity": "sha512-wEwIvDSwCSg5t19sN88fQ/Qv873Y9jm5L35vmuNU10NhYHS+fbKawha+Lj5Ftb0+tGHM19N2qc5X8mt2Pd5kGg==",
"dependencies": {
"@types/jsonwebtoken": "^8.5.0",
"@types/mongoose-autopopulate": "^0.10.1",
@@ -11337,9 +11337,9 @@
}
},
"@fosscord/server-util": {
- "version": "1.3.31",
- "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.31.tgz",
- "integrity": "sha512-RTtBOReZA5awzl30djmfZCUn0bjvhyv96S8swWE/z0kG2suSeCOOblirTqYjqjia4ho1hwKqIfg+z3NzNv05xA==",
+ "version": "1.3.32",
+ "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.32.tgz",
+ "integrity": "sha512-wEwIvDSwCSg5t19sN88fQ/Qv873Y9jm5L35vmuNU10NhYHS+fbKawha+Lj5Ftb0+tGHM19N2qc5X8mt2Pd5kGg==",
"requires": {
"@types/jsonwebtoken": "^8.5.0",
"@types/mongoose-autopopulate": "^0.10.1",
diff --git a/package.json b/package.json
index 53a39a09..524a5477 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
"test:watch": "jest --watch",
"start": "npm run build && node dist/start",
"build": "tsc -b .",
+ "build-docker": "tsc -p tsconfig-docker.json",
"dev": "tsnd --respawn src/start.ts",
"bundle:macos": "npx caxa -i . -m 'This may take a while to run the first time, please wait...' --output 'fosscord-api.app' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/dist/start.js' && tar -czf 'fosscord-api-macos.app.tgz' 'fosscord-api.app'",
"bundle:linux": "npx caxa -i . -m 'This may take a while to run the first time, please wait...' --output 'fosscord' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/dist/start.js' && tar -czf 'fosscord-api-linux.tgz' 'fosscord'",
@@ -32,7 +33,7 @@
},
"homepage": "https://github.com/fosscord/fosscord-api#readme",
"dependencies": {
- "@fosscord/server-util": "^1.3.31",
+ "@fosscord/server-util": "^1.3.35",
"@types/jest": "^26.0.22",
"@types/json-schema": "^7.0.7",
"ajv": "^8.4.0",
@@ -40,6 +41,7 @@
"assert": "^1.5.0",
"atomically": "^1.7.0",
"bcrypt": "^5.0.1",
+ "canvas": "^2.8.0",
"body-parser": "^1.19.0",
"cheerio": "^1.0.0-rc.9",
"dot-prop": "^6.0.1",
diff --git a/src/Server.ts b/src/Server.ts
index 39b1930d..52e217f8 100644
--- a/src/Server.ts
+++ b/src/Server.ts
@@ -103,6 +103,14 @@ export class FosscordServer extends Server {
app.use("/api/v8", prefix);
app.use("/api/v9", prefix);
app.use("/api", prefix); // allow unversioned requests
+
+ prefix.get("*", (req: Request, res: Response) => {
+ res.status(404).json({
+ message: "404: Not Found",
+ code: 0
+ });
+ });
+
this.app = app;
this.app.use(ErrorHandler);
const indexHTML = fs.readFileSync(path.join(__dirname, "..", "client_test", "index.html"), { encoding: "utf8" });
diff --git a/src/routes/auth/login.ts b/src/routes/auth/login.ts
index 82cefae8..af00a46d 100644
--- a/src/routes/auth/login.ts
+++ b/src/routes/auth/login.ts
@@ -15,7 +15,7 @@ router.post(
RateLimit({ count: 5, window: 60, onylIp: true }),
check({
login: new Length(String, 2, 100), // email or telephone
- password: new Length(String, 8, 64),
+ password: new Length(String, 8, 72),
$undelete: Boolean,
$captcha_key: String,
$login_source: String,
diff --git a/src/routes/auth/register.ts b/src/routes/auth/register.ts
index 25c7b3dd..41798552 100644
--- a/src/routes/auth/register.ts
+++ b/src/routes/auth/register.ts
@@ -16,8 +16,8 @@ router.post(
check({
username: new Length(String, 2, 32),
// TODO: check min password length in config
- // prevent Denial of Service with max length of 64 chars
- password: new Length(String, 8, 64),
+ // prevent Denial of Service with max length of 72 chars
+ password: new Length(String, 8, 72),
consent: Boolean,
$email: new Length(Email, 5, 100),
$fingerprint: String,
diff --git a/src/routes/channels/#channel_id/messages/index.ts b/src/routes/channels/#channel_id/messages/index.ts
index 053a2a02..4e42d546 100644
--- a/src/routes/channels/#channel_id/messages/index.ts
+++ b/src/routes/channels/#channel_id/messages/index.ts
@@ -126,7 +126,7 @@ router.post("/", messageUpload.single("file"), async (req: Request, res: Respons
const embeds = [];
if (body.embed) embeds.push(body.embed);
- const data = await sendMessage({ ...body, type: 0, pinned: false, author_id: req.user_id, embeds, channel_id, attachments });
+ const data = await sendMessage({ ...body, type: 0, pinned: false, author_id: req.user_id, embeds, channel_id, attachments, edited_timestamp: null });
return res.send(data);
});
diff --git a/src/routes/guilds/#guild_id/regions.ts b/src/routes/guilds/#guild_id/regions.ts
new file mode 100644
index 00000000..3a46d766
--- /dev/null
+++ b/src/routes/guilds/#guild_id/regions.ts
@@ -0,0 +1,10 @@
+import { Config } from "@fosscord/server-util";
+import { Request, Response, Router } from "express";
+
+const router = Router();
+
+router.get("/", async (req: Request, res: Response) => {
+ return res.json(Config.get().regions.available);
+});
+
+export default router;
\ No newline at end of file
diff --git a/src/routes/guilds/index.ts b/src/routes/guilds/index.ts
index 17ade355..25b55896 100644
--- a/src/routes/guilds/index.ts
+++ b/src/routes/guilds/index.ts
@@ -24,7 +24,7 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
const guild_id = Snowflake.generate();
const guild: Guild = {
name: body.name,
- region: body.region || "en-US",
+ region: Config.get().regions.default,
owner_id: req.user_id,
icon: undefined,
afk_channel_id: undefined,
diff --git a/tsconfig-docker.json b/tsconfig-docker.json
new file mode 100644
index 00000000..5d1f0a3c
--- /dev/null
+++ b/tsconfig-docker.json
@@ -0,0 +1,68 @@
+{
+ "include": ["src/**/*.ts"],
+ "compilerOptions": {
+ /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+ /* Basic Options */
+ // "incremental": true, /* Enable incremental compilation */
+ "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+ "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+ "lib": ["ES2020"] /* 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": false /* Generates corresponding '.d.ts' file. */,
+ "declarationMap": false /* Generates a sourcemap for each corresponding '.d.ts' file. */,
+ "sourceMap": true /* Generates corresponding '.map' file. */,
+ // "outFile": "./", /* Concatenate and emit output to single file. */
+ "outDir": "./dist/" /* Redirect output structure to the directory. */,
+ "rootDir": "./src/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+ // "composite": true, /* Enable project compilation */
+ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
+ // "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. */,
+ "strictNullChecks": true /* Enable strict null checks. */,
+ // "strictFunctionTypes": true, /* Enable strict checking of function types. */
+ // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+ "strictPropertyInitialization": false /* 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. */,
+
+ /* 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). */
+ // "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": ["node"] /* 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. */
+ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
+
+ /* 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. */
+
+ /* Advanced Options */
+ "skipLibCheck": true /* Skip type checking of declaration files. */,
+ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+ }
+}
|
