[Upstream] some code cleanup

api/package.json

@@ -8,7 +8,7 @@
     "start": "NODE_ENV=production node dist/index.js",
     "build": "tsc",
     "lint": "eslint --fix 'src/**/*.ts'",
-    "format": "prettier --write 'src/*.ts'",
+    "format": "prettier --write 'src/**/*.ts'",
     "dev": "NODE_ENV=development nodemon src/index.ts",
     "dev:migrate": "DATABASE_URL= yarn run db-migrate -e dev up"
   },

api/src/index.ts

@@ -70,7 +70,7 @@ function createApp(postgraphileOptions: PostGraphileOptions) {
   app.use(
     "/uploads",
     express.static("uploads", {
-      setHeaders: function (res, path, stat) {
+      setHeaders: function (res) {
         res.set("Content-Disposition", "attachment");
       },
     })

api/src/plugins/importCtf.ts

@@ -1,54 +1,57 @@
-
 import { makeExtendSchemaPlugin, gql } from "graphile-utils";
-import axios from "axios"
-import savepointWrapper from "./savepointWrapper"
+import axios from "axios";
+import savepointWrapper from "./savepointWrapper";
 
 interface CTFTimeResponse {
-    title: string;
-    weight: number;
-    url: string,
-    logo: string,
-    ctftime_url: string,
-    description: string,
-    start: string,
-    finish: string
+  title: string;
+  weight: number;
+  url: string;
+  logo: string;
+  ctftime_url: string;
+  description: string;
+  start: string;
+  finish: string;
 }
 
-
 async function fetchFromCtftime(id: number): Promise<CTFTimeResponse> {
-    const url = `https://ctftime.org/api/v1/events/${id}/`;
-    const response = await axios.get(url, {
-        headers: { "User-Agent": "CTFNote" }, // The default axios user-agent is blacklisted by ctftime :/
-    });
-    return response.data
+  const url = `https://ctftime.org/api/v1/events/${id}/`;
+  const response = await axios.get(url, {
+    headers: { "User-Agent": "CTFNote" }, // The default axios user-agent is blacklisted by ctftime :/
+  });
+  return response.data;
 }
 
+export default makeExtendSchemaPlugin((build) => {
+  const { pgSql: sql } = build;
+  return {
+    typeDefs: gql`
+      input ImportCtfInput {
+        ctftimeId: Int!
+      }
 
-export default makeExtendSchemaPlugin(build => {
-    const { pgSql: sql } = build;
-    return {
-        typeDefs: gql`     
-
-        input ImportCtfInput {
-            ctftimeId: Int!
-        }
-
-        type ImportCtfPayload {
-            ctf: Ctf @pgField
-            query: Query
-        }
+      type ImportCtfPayload {
+        ctf: Ctf @pgField
+        query: Query
+      }
 
-        extend type Mutation {
-            importCtf(input: ImportCtfInput) : ImportCtfPayload
-        }
-        `,
-        resolvers: {
-            Mutation: {
-                importCtf: async (_query, { input: { ctftimeId } }, { pgClient }, resolveInfo) => {
-                    const ctf = await fetchFromCtftime(ctftimeId)
-                    await savepointWrapper(pgClient, async () => {
-                        const { rows: [newCtf] } = await pgClient.query(
-                            `INSERT INTO ctfnote.ctf(
+      extend type Mutation {
+        importCtf(input: ImportCtfInput): ImportCtfPayload
+      }
+    `,
+    resolvers: {
+      Mutation: {
+        importCtf: async (
+          _query,
+          { input: { ctftimeId } },
+          { pgClient },
+          resolveInfo
+        ) => {
+          const ctf = await fetchFromCtftime(ctftimeId);
+          await savepointWrapper(pgClient, async () => {
+            const {
+              rows: [newCtf],
+            } = await pgClient.query(
+              `INSERT INTO ctfnote.ctf(
                                 title,
                                 weight,
                                 ctf_url,
@@ -60,32 +63,33 @@ export default makeExtendSchemaPlugin(build => {
                                 ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
                                 RETURNING *;
                                 `,
-                            [
-                                ctf.title,
-                                ctf.weight,
-                                ctf.url,
-                                ctf.logo,
-                                ctf.ctftime_url,
-                                ctf.description,
-                                ctf.start,
-                                ctf.finish,
-                            ]
-                        )
-                        const [row] = await resolveInfo.graphile.selectGraphQLResultFromTable(
-                            sql.fragment`ctfnote.ctf`,
-                            (tableAlias, queryBuilder) => {
-                                queryBuilder.where(
-                                    sql.fragment`${tableAlias}.id = ${sql.value(newCtf.id)}`
-                                );
-                            }
-                        )
-                        return {
-                            data: row,
-                            query: build.$$isQuery,
-                        };
-                    })
-                },
-            },
+              [
+                ctf.title,
+                ctf.weight,
+                ctf.url,
+                ctf.logo,
+                ctf.ctftime_url,
+                ctf.description,
+                ctf.start,
+                ctf.finish,
+              ]
+            );
+            const [row] =
+              await resolveInfo.graphile.selectGraphQLResultFromTable(
+                sql.fragment`ctfnote.ctf`,
+                (tableAlias, queryBuilder) => {
+                  queryBuilder.where(
+                    sql.fragment`${tableAlias}.id = ${sql.value(newCtf.id)}`
+                  );
+                }
+              );
+            return {
+              data: row,
+              query: build.$$isQuery,
+            };
+          });
         },
-    };
+      },
+    },
+  };
 });

api/src/plugins/savepointWrapper.ts

@@ -1,16 +1,19 @@
-import { Client } from "pg"
+import { Client } from "pg";
 
-async function savepointWrapper(pgClient: Client, f: () => void): Promise<void> {
-    const name = `"CHECKPOINT-${Math.floor(Math.random() * 0xffff)}"`
-    await pgClient.query(`SAVEPOINT ${name}`);
-    try {
-        await f()
-    } catch (e) {
-        await pgClient.query(`ROLLBACK TO SAVEPOINT ${name}`);
-        throw e;
-    } finally {
-        await pgClient.query(`RELEASE SAVEPOINT ${name}`);
-    }
+async function savepointWrapper(
+  pgClient: Client,
+  f: () => void
+): Promise<void> {
+  const name = `"CHECKPOINT-${Math.floor(Math.random() * 0xffff)}"`;
+  await pgClient.query(`SAVEPOINT ${name}`);
+  try {
+    await f();
+  } catch (e) {
+    await pgClient.query(`ROLLBACK TO SAVEPOINT ${name}`);
+    throw e;
+  } finally {
+    await pgClient.query(`RELEASE SAVEPOINT ${name}`);
+  }
 }
 
-export default savepointWrapper;
+export default savepointWrapper;

docker-compose.dev.yml

@@ -17,9 +17,10 @@ services:
   hedgedoc:
     image: quay.io/hedgedoc/hedgedoc:1.9.0-alpine
     environment:
-      - CMD_DB_URL=postgres://ctfnote:ctfnote@db:5432/hedgedoc
-      - CMD_URL_PATH=pad
-      - CMD_IMAGE_UPLOAD_TYPE=filesystem
+      CMD_DB_URL: 'postgres://ctfnote:ctfnote@db:5432/hedgedoc'
+      CMD_URL_PATH: 'pad'
+      CMD_IMAGE_UPLOAD_TYPE: 'filesystem'
+      CMD_CSP_ENABLE: 'false'
     depends_on:
       - db
     restart: always

front/src/components/CTF/Guests.vue

@@ -58,7 +58,11 @@ export default defineComponent({
   },
   computed: {
     guests() {
-      return this.team.filter((p) => p.role == Role.UserGuest || (p.role == Role.UserFriend && this.ctf.endTime > this.now));
+      return this.team.filter(
+        (p) =>
+          p.role == Role.UserGuest ||
+          (p.role == Role.UserFriend && this.ctf.endTime > this.now)
+      );
     },
     guestsWithInvitation() {
       return this.guests.map((g) => {