Merge pull request #616 from ajayyy/dependabot/npm_and_yarn/js-yaml-3.14.2

Bump js-yaml from 3.14.1 to 3.14.2

.editorconfig

@@ -0,0 +1,17 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,json,ts,tsx}]
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+[package.json]
+indent_size = 2

.eslintrc.js

@@ -0,0 +1,46 @@
+module.exports = {
+    env: {
+        browser: false,
+        es2021: true,
+        node: true,
+    },
+    extends: [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+    ],
+    parser: "@typescript-eslint/parser",
+    parserOptions: {
+        ecmaVersion: 12,
+        sourceType: "module",
+    },
+    plugins: ["@typescript-eslint"],
+    rules: {
+        // TODO: Remove warn rules when not needed anymore
+        "@typescript-eslint/no-empty-interface": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "indent": ["warn", 4, { "SwitchCase": 1 }],
+        "no-multiple-empty-lines": ["error", { max: 2, maxEOF: 0 }],
+        "no-self-assign": "off",
+        "no-trailing-spaces": "warn",
+        "object-curly-spacing": ["warn", "always"],
+        "prefer-template": "warn",
+        "quotes": ["warn", "double", { "avoidEscape": true, "allowTemplateLiterals": true }],
+        "require-await": "warn",
+        "semi": "warn",
+        "no-console": "warn"
+    },
+    overrides: [
+        {
+            files: ["**/*.ts"],
+
+            parserOptions: {
+                project: ["./tsconfig.eslint.json"],
+            },
+
+            rules: {
+                "@typescript-eslint/no-misused-promises": "error",
+                "@typescript-eslint/no-floating-promises" : "error"
+            }
+        },
+    ],
+};

.github/pull_request_template.md

@@ -0,0 +1,3 @@
+- [ ] I agree to license my contribution under AGPL-3.0-only with my contribution automatically being licensed under LGPL-3.0 additionally after 6 months
+
+***

.github/workflows/ci.yml

@@ -1,18 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-
-  build:
-    name: Run Tests
-    runs-on: ubuntu-latest
-
-    steps:
-      # Initialization
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-      - run: npm install
-
-      - name: Run Tests
-        run: npm test

.github/workflows/db-backup.yml

@@ -0,0 +1,18 @@
+name: Docker image builds
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - containers/backup-db/**
+  workflow_dispatch:
+
+jobs:
+  backup-db:
+    uses: ./.github/workflows/docker-build.yml
+    with:
+      name: "db-backup"
+      username: "ajayyy"
+      folder: "./containers/backup-db"
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-build.yml

@@ -0,0 +1,54 @@
+# Based on https://github.com/ajayyy/sb-mirror/blob/main/.github/workflows/docker-build.yml
+name: multi-build-docker
+on: 
+  workflow_call:
+    inputs:
+      name:
+        required: true
+        type: string
+      username:
+        required: true
+        type: string
+      folder:
+        required: true
+        type: string
+    secrets:
+      GH_TOKEN:
+        required: true
+
+jobs:
+  build_container:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ inputs.username }}/${{ inputs.name }}
+          tags: |
+            type-raw,value=alpine
+          flavor: |
+            latest=true
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GH_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm,arm64
+      - name: Set up buildx
+        uses: docker/setup-buildx-action@v3
+      - name: push
+        uses: docker/build-push-action@v6
+        with:
+          context: ${{ inputs.folder }}
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/error-server.yml

@@ -0,0 +1,16 @@
+name: Docker image builds
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  error-server:
+    uses: ./.github/workflows/docker-build.yml
+    with:
+      name: "error-server"
+      username: "ajayyy"
+      folder: "./containers/error-server"
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generate-sqlite-base.yml

@@ -0,0 +1,41 @@
+name: create-sqlite-base
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - databases/**
+  workflow_dispatch:
+
+jobs:
+  make-base-db:
+    name: Generate SQLite base .db
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: npm
+      - run: npm ci
+      - name: Set config
+        run: |
+          echo '{"mode": "init-db-and-exit"}' > config.json
+      - name: Run Server
+        timeout-minutes: 10
+        run: npm start
+      - uses: actions/upload-artifact@v4
+        with:
+          name: SponsorTimesDB.db
+          path: databases/sponsorTimes.db
+      - uses: mchangrh/s3cmd-sync@f4f36b9705bdd9af7ac91964136989ac17e3b513
+        with:
+          args: --acl-public
+        env:
+          S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
+          S3_BUCKET: ${{ secrets.S3_BUCKET }}
+          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+          S3_ACCESS_KEY_SECRET: ${{ secrets.S3_ACCESS_KEY_SECRET }}
+          SOURCE_DIR: 'databases/sponsorTimes.db'

.github/workflows/sb-server.yml

@@ -0,0 +1,25 @@
+name: Docker image builds
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  sb-server:
+    uses: ./.github/workflows/docker-build.yml
+    with:
+      name: "sb-server"
+      username: "ajayyy"
+      folder: "."
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  rsync-host:
+    needs: sb-server
+    uses: ./.github/workflows/docker-build.yml
+    with:
+      name: "rsync-host"
+      username: "ajayyy"
+      folder: "./containers/rsync"
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/take-action.yml

@@ -0,0 +1,12 @@
+name: Assign issue to contributor
+on: [issue_comment]
+
+jobs:
+  assign:
+    name: Take an issue
+    runs-on: ubuntu-latest
+    steps:
+      - name: take the issue
+        uses: bdougie/take-action@28b86cd8d25593f037406ecbf96082db2836e928
+        env:
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/test.yaml

@@ -0,0 +1,121 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  lint-build:
+    name: Lint with ESLint and build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: npm
+      - run: npm ci
+      - run: npm run lint
+      - run: npm run tsc
+      - name: cache dist build
+        uses: actions/cache/save@v4
+        with:
+          key: dist-${{ github.sha }}
+          path: |
+            ${{ github.workspace }}/dist
+            ${{ github.workspace }}/node_modules
+  test-sqlite:
+    name: Run Tests with SQLite
+    runs-on: ubuntu-latest
+    needs: lint-build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: npm
+      - id: cache
+        uses: actions/cache/restore@v4
+        with:
+          key: dist-${{ github.sha }}
+          path: |
+            ${{ github.workspace }}/dist
+            ${{ github.workspace }}/node_modules
+      - if: steps.cache.outputs.cache-hit != 'true'
+        run: npm ci
+        env:
+          youTubeKeys_visitorData: ${{ secrets.YOUTUBEKEYS_VISITORDATA }}
+          youTubeKeys_poToken: ${{ secrets.YOUTUBEKEYS_POTOKEN }}
+      - name: Run SQLite Tests
+        timeout-minutes: 5
+        run: npx nyc --silent npm test
+      - name: cache nyc output
+        uses: actions/cache/save@v4
+        with:
+          key: nyc-sqlite-${{ github.sha }}
+          path: ${{ github.workspace }}/.nyc_output
+  test-postgres:
+    name: Run Tests with PostgreSQL and Redis
+    runs-on: ubuntu-latest
+    needs: lint-build
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build the docker-compose stack
+        env:
+          PG_USER: ci_db_user
+          PG_PASS: ci_db_pass
+        run: docker compose -f docker/docker-compose-ci.yml up -d
+      - name: Check running containers
+        run: docker ps
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: npm
+      - id: cache
+        uses: actions/cache/restore@v4
+        with:
+          key: dist-${{ github.sha }}
+          path: |
+            ${{ github.workspace }}/dist
+            ${{ github.workspace }}/node_modules
+      - if: steps.cache.outputs.cache-hit != 'true'
+        run: npm ci
+      - name: Run Postgres Tests
+        env:
+          TEST_POSTGRES: true
+          youTubeKeys_visitorData: ${{ secrets.YOUTUBEKEYS_VISITORDATA }}
+          youTubeKeys_poToken: ${{ secrets.YOUTUBEKEYS_POTOKEN }}
+        timeout-minutes: 5
+        run: npx nyc --silent npm test
+      - name: cache nyc output
+        uses: actions/cache/save@v4
+        with:
+          key: nyc-postgres-${{ github.sha }}
+          path: ${{ github.workspace }}/.nyc_output
+  codecov:
+    needs: [test-sqlite, test-postgres]
+    name: Run Codecov
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: npm
+      - run: npm ci
+      - name: restore postgres nyc output
+        uses: actions/cache/restore@v4
+        with:
+          key: nyc-postgres-${{ github.sha }}
+          path: ${{ github.workspace }}/.nyc_output
+      - name: restore sqlite nyc output
+        uses: actions/cache/restore@v4
+        with:
+          key: nyc-sqlite-${{ github.sha }}
+          path: ${{ github.workspace }}/.nyc_output
+      - run: npx nyc report --reporter=lcov
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4

.gitignore

@@ -2,47 +2,9 @@
 logs
 *.log
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
 
 # Dependency directories
 node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
 
 # TypeScript cache
 *.tsbuildinfo
@@ -53,53 +15,39 @@ typings/
 # Optional eslint cache
 .eslintcache
 
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
 # dotenv environment variables file
 .env
 .env.test
 
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# next.js build output
-.next
-
-# nuxt.js build output
-.nuxt
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
 # Databases
 databases/sponsorTimes.db
 databases/sponsorTimes.db-shm
 databases/sponsorTimes.db-wal
 databases/private.db
+databases/private.db-shm
+databases/private.db-wal
 databases/sponsorTimesReal.db
 test/databases/sponsorTimes.db
 test/databases/sponsorTimes.db-shm
 test/databases/sponsorTimes.db-wal
 test/databases/private.db
+databases/cache
+docker/database-export
 
 # Config files
 config.json
+docker/database.env
+
+# Other
+working
 
 # Mac files
-.DS_Store
+.DS_Store
+/.idea/
+/dist/
+
+# nyc coverage output
+.nyc_output/
+coverage/
+
+.vscode

.nycrc.json

@@ -0,0 +1,14 @@
+{
+  "extends": "@istanbuljs/nyc-config-typescript",
+  "check-coverage": false,
+  "ski-full": true,
+  "reporter": ["text", "html"],
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "src/routes/addUnlistedVideo.ts",
+    "src/cronjob/downvoteSegmentArchiveJob.ts",
+    "src/databases/*"
+  ]
+}

DatabaseSchema.md

@@ -0,0 +1,419 @@
+# SponsorTimesDB
+
+- [vipUsers](#vipusers)
+- [sponsorTimes](#sponsortimes)
+- [userNames](#usernames)
+- [categoryVotes](#categoryvotes)
+- [lockCategories](#lockcategories)
+- [warnings](#warnings)
+- [shadowBannedUsers](#shadowbannedusers)
+- [videoInfo](#videoinfo)
+- [unlistedVideos](#unlistedvideos)
+- [config](#config)
+- [archivedSponsorTimes](#archivedsponsortimes)
+- [ratings](#ratings)
+- [userFeatures](#userFeatures)
+- [shadowBannedIPs](#shadowBannedIPs)
+- [titles](#titles)
+- [titleVotes](#titleVotes)
+- [thumbnails](#thumbnails)
+- [thumbnailTimestamps](#thumbnailTimestamps)
+- [thumbnailVotes](#thumbnailVotes)
+
+### vipUsers
+| Name | Type | |
+| -- | :--: | -- |
+| userID | TEXT | not null, primary key |
+
+| index | field |
+| -- | :--: |
+| vipUsers_index | userID |
+
+### sponsorTimes  
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| startTime | REAL | not null |
+| endTime | REAL | not null |
+| votes | INTEGER | not null |
+| locked | INTEGER | not null, default '0' |
+| incorrectVotes | INTEGER | not null, default 1 |
+| UUID | TEXT | not null, unique, primary key |
+| userID | TEXT | not null |
+| timeSubmitted | INTEGER | not null |
+| views | INTEGER | not null |
+| category | TEXT | not null, default 'sponsor' |
+| actionType | TEXT | not null, default 'skip' |
+| service | TEXT | not null, default 'YouTube' |
+| videoDuration | INTEGER | not null, default '0' |
+| hidden | INTEGER | not null, default '0' |
+| reputation | REAL | not null, default '0' |
+| shadowHidden | INTEGER | not null |
+| hashedVideoID | TEXT | not null, default '', sha256 |
+| userAgent | TEXT | not null, default '' |
+| description | TEXT | not null, default '' |
+
+| index | field |
+| -- | :--: |
+| sponsorTime_timeSubmitted | timeSubmitted |
+| sponsorTime_userID | userID |
+| sponsorTimes_UUID | UUID |
+| sponsorTimes_hashedVideoID | service, hashedVideoID, startTime |
+| sponsorTimes_videoID | service, videoID, startTime |
+| sponsorTimes_videoID_category | videoID, category |
+| sponsorTimes_description_gin | description, category |
+
+### userNames
+
+| Name | Type | |
+| -- | :--: | -- |
+| userID | TEXT | not null, primary key |
+| userName | TEXT | not null |
+| locked | INTEGER | not nul, default '0' |
+
+| index | field |
+| -- | :--: |
+| userNames_userID | userID |
+
+### categoryVotes
+
+| Name | Type | |
+| -- | :--: | -- |
+| UUID | TEXT | not null |
+| category | TEXT | not null |
+| votes | INTEGER | not null, default 0 |
+| id | SERIAL | primary key
+
+| index | field |
+| -- | :--: |
+| categoryVotes_UUID_public | UUID, category |
+
+### lockCategories  
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| userID | TEXT | not null |
+| actionType | TEXT | not null, default 'skip' |
+| category | TEXT | not null |
+| hashedVideoID | TEXT | not null, default '' |
+| reason | TEXT | not null, default '' |
+| service | TEXT | not null, default 'YouTube' |
+| id | SERIAL | primary key
+
+| index | field |
+| -- | :--: |
+| lockCategories_videoID | videoID, service, category |
+
+### warnings  
+
+| Name | Type | |
+| -- | :--: | -- |
+| userID | TEXT | not null |
+| issueTime | INTEGER | not null |
+| issuerUserID | TEXT | not null |
+| enabled | INTEGER | not null |
+| reason | TEXT | not null, default '' |
+| type | INTEGER | default 0 |
+
+| constraint | field |
+| -- | :--: |
+| PRIMARY KEY | userID, issueTime |
+
+| index | field |
+| -- | :--: |
+| warnings_index | userID, issueTime, enabled |
+| warnings_issueTime | issueTime |
+
+### shadowBannedUsers  
+
+| Name | Type | |
+| -- | :--: | -- |
+| userID | TEXT | not null, primary key |
+
+| index | field |
+| -- | :--: |
+| shadowBannedUsers_index | userID |
+
+### videoInfo  
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| channelID | TEXT | not null |
+| title | TEXT | not null |
+| published | REAL | not null |
+
+| index | field |
+| -- | :--: |
+| videoInfo_videoID | videoID |
+| videoInfo_channelID | channelID |
+
+### unlistedVideos  
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| year | TEXT | not null |
+| views | TEXT | not null |
+| channelID | TEXT | not null |
+| timeSubmitted | INTEGER | not null |
+| service | TEXT | not null, default 'YouTube' |
+| id | SERIAL | primary key
+
+### config
+
+| Name | Type | |
+| -- | :--: | -- |
+| key | TEXT | not null, unique, primary key |
+| value | TEXT | not null |
+
+### archivedSponsorTimes
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| startTime | REAL | not null |
+| endTime | REAL | not null |
+| votes | INTEGER | not null |
+| locked | INTEGER | not null, default '0' |
+| incorrectVotes | INTEGER | not null, default 1 |
+| UUID | TEXT | not null, unique, primary key |
+| userID | TEXT | not null |
+| timeSubmitted | INTEGER | not null |
+| views | INTEGER | not null |
+| category | TEXT | not null, default 'sponsor' |
+| actionType | TEXT | not null, default 'skip' |
+| service | TEXT | not null, default 'YouTube' |
+| videoDuration | INTEGER | not null, default '0' |
+| hidden | INTEGER | not null, default '0' |
+| reputation | REAL | not null, default '0' |
+| shadowHidden | INTEGER | not null |
+| hashedVideoID | TEXT | not null, default '', sha256 |
+| userAgent | TEXT | not null, default '' |
+| description | TEXT | not null, default '' |
+
+### ratings  
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| service | TEXT | not null, default 'YouTube' |
+| type | INTEGER | not null |
+| count | INTEGER | not null |
+| hashedVideoID | TEXT | not null |
+| id | SERIAL | primary key
+
+| index | field |
+| -- | :--: |
+| ratings_hashedVideoID_gin | hashedVideoID |
+| ratings_hashedVideoID | hashedVideoID, service |
+| ratings_videoID | videoID, service |
+
+### userFeatures
+| Name | Type | |
+| -- | :--: | -- |
+| userID | TEXT | not null |
+| feature | INTEGER | not null |
+| issuerUserID | TEXT | not null |
+| timeSubmitted | INTEGER | not null |
+
+| constraint | field |
+| -- | :--: |
+| primary key | userID, feature |
+
+| index | field |
+| -- | :--: |
+| userFeatures_userID | userID, feature |
+
+### shadowBannedIPs
+
+| Name | Type | |
+| -- | :--: | -- |
+| hashedIP | TEXT | not null, primary key |
+
+### titles
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| title | TEXT | not null |
+| original | INTEGER | default 0 |
+| userID | TEXT | not null
+| service | TEXT | not null |
+| hashedVideoID | TEXT | not null |
+| timeSubmitted | INTEGER | not null |
+| UUID | TEXT | not null, primary key
+
+| index | field |
+| -- | :--: |
+| titles_timeSubmitted | timeSubmitted |
+| titles_userID_timeSubmitted | videoID, service, userID, timeSubmitted |
+| titles_videoID | videoID, service |
+| titles_hashedVideoID_2 | service, hashedVideoID, timeSubmitted |
+
+### titleVotes
+
+| Name | Type | |
+| -- | :--: | -- |
+| UUID | TEXT | not null, primary key |
+| votes | INTEGER | not null, default 0 |
+| locked | INTEGER | not null, default 0 |
+| shadowHidden | INTEGER | not null, default 0 |
+| verification | INTEGER | default 0 |
+| downvotes | INTEGER | default 0 |
+| removed | INTEGER | default 0 |
+
+| constraint | field |
+| -- | :--: |
+| foreign key | UUID references "titles"("UUID")
+
+| index | field |
+| -- | :--: |
+| titleVotes_votes | UUID, votes
+
+### thumbnails
+
+| Name | Type | |
+| -- | :--: | -- |
+| original | INTEGER | default 0 |
+| userID | TEXT | not null |
+| service | TEXT | not null |
+| hashedVideoID | TEXT | not null |
+| timeSubmitted | INTEGER | not null |
+| UUID | TEXT | not null, primary key |
+
+| index | field |
+| -- | :--: |
+| thumbnails_timeSubmitted | timeSubmitted |
+| thumbnails_votes_timeSubmitted | videoID, service, userID, timeSubmitted |
+| thumbnails_videoID | videoID, service |
+| thumbnails_hashedVideoID_2 | service, hashedVideoID, timeSubmitted |
+
+### thumbnailTimestamps
+
+| index | field |
+| -- | :--: |
+| UUID | TEXT | not null, primary key
+| timestamp | INTEGER | not null, default 0
+
+| constraint | field |
+| -- | :--: |
+| foreign key | UUID references "thumbnails"("UUID")
+
+### thumbnailVotes
+
+| Name | Type | |
+| -- | :--: | -- |
+| UUID | TEXT | not null, primary key |
+| votes | INTEGER | not null, default 0 |
+| locked | INTEGER |not null, default 0 |
+| shadowHidden | INTEGER | not null, default 0 |
+| downvotes | INTEGER | default 0 |
+| removed | INTEGER | default 0 |
+
+| constraint | field |
+| -- | :--: |
+| foreign key | UUID references "thumbnails"("UUID")
+
+| index | field |
+| -- | :--: |
+| thumbnailVotes_votes | UUID, votes
+
+# Private 
+
+- [votes](#votes)
+- [categoryVotes](#categoryVotes)
+- [sponsorTimes](#sponsorTimes)
+- [config](#config)
+- [ratings](#ratings)
+- [tempVipLog](#tempVipLog)
+- [userNameLogs](#userNameLogs)
+
+### votes
+
+| Name | Type | |
+| -- | :--: | -- |
+| UUID | TEXT | not null |
+| userID | TEXT | not null |
+| hashedIP | TEXT | not null |
+| type | INTEGER | not null |
+| originalVoteType | INTEGER | not null | # Since type was reused to also specify the number of votes removed when less than 0, this is being used for the actual type
+| id | SERIAL | primary key |
+
+| index | field |
+| -- | :--: |
+| votes_userID | UUID |
+
+### categoryVotes
+
+| Name | Type | |
+| -- | :--: | -- |
+| UUID | TEXT | not null |
+| userID | TEXT | not null |
+| hashedIP | TEXT | not null |
+| category | TEXT | not null |
+| timeSubmitted | INTEGER | not null |
+| id | SERIAL | primary key |
+
+| index | field |
+| -- | :--: |
+| categoryVotes_UUID | UUID, userID, hashedIP, category |
+
+### sponsorTimes  
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| hashedIP | TEXT | not null |
+| timeSubmitted | INTEGER | not null |
+| service | TEXT | not null, default 'YouTube' |
+| id | SERIAL | primary key |
+
+| index | field |
+| -- | :--: |
+| privateDB_sponsorTimes_v4 | videoID, service, timeSubmitted |
+
+### config  
+
+| Name | Type | |
+| -- | :--: | -- |
+| key | TEXT | not null, primary key |
+| value | TEXT | not null |
+
+### ratings  
+
+| Name | Type | |
+| -- | :--: | -- |
+| videoID | TEXT | not null |
+| service | TEXT | not null, default 'YouTube' |
+| userID | TEXT | not null |
+| type | INTEGER | not null |
+| timeSubmitted | INTEGER | not null |
+| hashedIP | TEXT | not null |
+| id | SERIAL | primary key |
+
+| index | field |
+| -- | :--: |
+| ratings_videoID | videoID, service, userID, timeSubmitted |
+
+### tempVipLog
+| Name | Type | |
+| -- | :--: | -- |
+| issuerUserID | TEXT | not null |
+| targetUserID | TEXT | not null |
+| enabled | BOOLEAN | not null |
+| updatedAt | INTEGER | not null |
+| id | SERIAL | primary key |
+
+### userNameLogs
+
+| Name | Type | |
+| -- | :--: | -- |
+| userID | TEXT | not null |
+| newUserName | TEXT | not null |
+| oldUserName | TEXT | not null |
+| updatedByAdmin | BOOLEAN | not null |
+| updatedAt | INTEGER | not null |
+| id | SERIAL | primary key |

Dockerfile

@@ -1,11 +1,16 @@
-FROM node:12
-WORKDIR /usr/src/app
-COPY package.json .
-RUN npm install
-COPY index.js .
+FROM node:18-alpine as builder
+RUN apk add --no-cache --virtual .build-deps python3 make g++
+COPY package.json package-lock.json tsconfig.json entrypoint.sh ./
 COPY src src
-RUN mkdir databases
-COPY databases/*.sql databases/
+RUN npm ci && npm run tsc
+
+FROM node:18-alpine as app
+WORKDIR /usr/src/app
+RUN apk add --no-cache git postgresql-client
+COPY --from=builder ./node_modules ./node_modules
+COPY --from=builder ./dist ./dist
+COPY ./.git/ ./.git
 COPY entrypoint.sh .
+COPY databases/*.sql databases/
 EXPOSE 8080
-CMD ./entrypoint.sh
+CMD ./entrypoint.sh

LICENSE

@@ -1,21 +1,661 @@
-MIT License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2019 Ajay Ramachandran
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

LICENSE.old

@@ -0,0 +1,27 @@
+License for code prior to commit d738e89f203e9cea21b7df4acb9f4b3505f0acdd
+
+You must follow LICENSE instead if you want to use any newer version.
+
+----
+
+MIT License
+
+Copyright (c) 2019 Ajay Ramachandran
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.MD

@@ -6,9 +6,9 @@ This is the server backend for it
 
 # Server
 
-This is a simple Sqlite database that will hold all the timing data.
+This uses a Postgres or Sqlite database to hold all the timing data.
 
-To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database.db. You can download a backup or get archive.org to take a backup if you do desire. The database is under [this license](https://creativecommons.org/licenses/by-nc-sa/4.0/) unless you get explicit permission from me.
+To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database. You can download a backup or get archive.org to take a backup if you do desire. The database is under [this license](https://creativecommons.org/licenses/by-nc-sa/4.0/) unless you get explicit permission from me.
 
 Hopefully this project can be combined with projects like [this](https://github.com/Sponsoff/sponsorship_remover) and use this data to create a neural network to predict when sponsored segments happen. That project is sadly abandoned now, so I have decided to attempt to revive this idea.
 
@@ -34,4 +34,8 @@ If you want to make changes, run `npm run dev` to automatically reload the serve
 
 # API Docs
 
-Available [here](https://github.com/ajayyy/SponsorBlock/wiki/API-Docs)
+Available [here](https://wiki.sponsor.ajay.app/index.php/API_Docs)
+
+# License
+
+This is licensed under AGPL-3.0-only.

ci.json

@@ -0,0 +1,79 @@
+{
+    "port": 8080,
+    "mockPort": 8081,
+    "globalSalt": "testSalt",
+    "adminUserID": "4bdfdc9cddf2c7d07a8a87b57bf6d25389fb75d1399674ee0e0938a6a60f4c3b",
+    "newLeafURLs": ["placeholder"],
+    "discordReportChannelWebhookURL": "http://127.0.0.1:8081/webhook/ReportChannel",
+    "discordFirstTimeSubmissionsWebhookURL": "http://127.0.0.1:8081/webhook/FirstTimeSubmissions",
+    "discordCompletelyIncorrectReportWebhookURL": "http://127.0.0.1:8081/webhook/CompletelyIncorrectReport",
+    "discordNeuralBlockRejectWebhookURL": "http://127.0.0.1:8081/webhook/NeuralBlockReject",
+    "neuralBlockURL": "http://127.0.0.1:8081/NeuralBlock",
+    "userCounterURL": "http://127.0.0.1:8081/UserCounter",
+    "behindProxy": true,
+    "postgres": {
+        "user": "ci_db_user",
+        "password": "ci_db_pass",
+        "host": "localhost",
+        "port": 5432
+    },
+    "redis": {
+        "enabled": true,
+        "socket": {
+            "host": "localhost",
+            "port": 6379
+        },
+        "expiryTime": 86400
+    },
+    "createDatabaseIfNotExist": true,
+    "schemaFolder": "./databases",
+    "dbSchema": "./databases/_sponsorTimes.db.sql",
+    "privateDBSchema": "./databases/_private.db.sql",
+    "categoryList": ["sponsor", "selfpromo", "exclusive_access", "interaction", "intro", "outro", "preview", "music_offtopic", "filler", "poi_highlight", "chapter"],
+    "mode": "test",
+    "readOnly": false,
+    "webhooks": [
+        {
+            "url": "http://127.0.0.1:8081/CustomWebhook",
+            "key": "superSecretKey",
+            "scopes": [
+                "vote.up",
+                "vote.down"
+            ]
+        }, {
+            "url": "http://127.0.0.1:8081/FailedWebhook",
+            "key": "superSecretKey",
+            "scopes": [
+                "vote.up",
+                "vote.down"
+            ]
+        }, {
+            "url": "http://127.0.0.1:8099/WrongPort",
+            "key": "superSecretKey",
+            "scopes": [
+                "vote.up",
+                "vote.down"
+            ]
+        }
+    ],
+    "rateLimit": {
+        "vote": {
+          "windowMs": 900000,
+          "max": 20,
+          "message": "Too many votes, please try again later",
+          "statusCode": 429
+        },
+        "view": {
+          "windowMs": 900000,
+          "max": 20,
+          "statusCode": 200
+        }
+    },
+    "patreon": {
+        "clientId": "testClientID",
+        "clientSecret": "testClientSecret",
+        "redirectUri": "http://127.0.0.1/fake/callback"
+    },
+    "minReputationToSubmitFiller": -1,
+    "minUserIDLength": 0
+}

codecov.yml

@@ -0,0 +1,9 @@
+comment: false
+coverage:
+  status:
+    project:
+      default:
+        informational: true
+    patch:
+      default:
+        informational: true

config.json.example

@@ -4,7 +4,7 @@
     "port": 80,
     "globalSalt": "[global salt (pepper) that is added to every ip before hashing to make it even harder for someone to decode the ip]",
     "adminUserID": "[the hashed id of the user who can perform admin actions]",
-    "youtubeAPIKey": null, //get this from Google Cloud Platform [optional]
+    "newLeafURLs": ["http://localhost:3241"],
     "discordReportChannelWebhookURL": null, //URL from discord if you would like notifications when someone makes a report [optional]
     "discordFirstTimeSubmissionsWebhookURL": null, //URL from discord if you would like notifications when someone makes a first time submission [optional]
     "discordCompletelyIncorrectReportWebhookURL": null, //URL from discord if you would like notifications when someone reports a submission as completely incorrect [optional]
@@ -19,13 +19,12 @@
     "schemaFolder": "./databases",
     "dbSchema": "./databases/_sponsorTimes.db.sql",
     "privateDBSchema": "./databases/_private.db.sql",
+    // when using redis, add `"enable_offline_queue": false` to force commands to fail instead of timing out
     "mode": "development",
     "readOnly": false,
     "webhooks": [],
-    "categoryList": ["sponsor", "intro", "outro", "interaction", "selfpromo", "music_offtopic"], // List of supported categories any other category will be rejected
+    "categoryList": ["sponsor", "intro", "outro", "interaction", "selfpromo", "preview", "music_offtopic", "poi_highlight"], // List of supported categories any other category will be rejected
     "getTopUsersCacheTimeMinutes": 5, // cacheTime for getTopUsers result in minutes
-    "maxNumberOfActiveWarnings": 3, // Users with this number of warnings will be blocked until warnings expire
-    "hoursAfterWarningExpire": 24,
     "rateLimit": {
       "vote": {
         "windowMs": 900000, // 15 minutes
@@ -38,5 +37,33 @@
         "max": 20, // 20 requests in 15min time window
         "statusCode": 200
       }
-    }
+    },
+    "maxRewardTimePerSegmentInSeconds": 86400, // maximum time a user get rewarded in the leaderboard for a single segment
+    "dumpDatabase": {
+        "enabled": true,
+        "minTimeBetweenMs": 60000, // 1 minute between dumps
+        "appExportPath": "./docker/database-export",
+        "postgresExportPath": "/opt/exports",
+        "tables": [{
+            "name": "sponsorTimes",
+            "order": "timeSubmitted"
+        },
+        {
+            "name": "userNames"
+        },
+        {
+            "name": "categoryVotes"
+        },
+        {
+            "name": "lockCategories"
+        },
+        {
+            "name": "warnings",
+            "order": "issueTime"
+        },
+        {
+            "name": "vipUsers"
+        }]
+    },
+    "minUserIDLength": 30 // minimum length of UserID to be accepted
 }

containers/backup-db/Dockerfile

@@ -0,0 +1,13 @@
+FROM alpine as builder
+WORKDIR /scripts
+COPY ./backup.sh ./backup.sh
+COPY ./forget.sh ./forget.sh
+
+FROM alpine
+RUN apk add --no-cache postgresql-client restic
+COPY --from=builder --chmod=755 /scripts /usr/src/app/
+
+RUN echo '30  *  *  *  *    /usr/src/app/backup.sh' >> /etc/crontabs/root
+RUN echo '10  0  *  *  */2    /usr/src/app/forget.sh' >> /etc/crontabs/root
+
+CMD crond -l 2 -f

containers/backup-db/backup.sh

@@ -0,0 +1,6 @@
+mkdir ./dump
+
+pg_dump -f ./dump/sponsorTimes.dump sponsorTimes
+pg_dump -f ./dump/privateDB.dump privateDB
+
+restic backup ./dump

containers/backup-db/forget.sh

@@ -0,0 +1 @@
+restic forget --prune --keep-hourly 24 --keep-daily 7 --keep-weekly 8

containers/error-server/Dockerfile

@@ -0,0 +1,4 @@
+FROM nginx as app
+EXPOSE 80
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY default.conf /etc/nginx/conf.d/default.conf

containers/error-server/default.conf

@@ -0,0 +1,9 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    location / {
+        return 503;
+    }
+}

containers/error-server/nginx.conf

@@ -0,0 +1,19 @@
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  4096;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    access_log off;
+	error_log /dev/null crit;
+
+    include /etc/nginx/conf.d/*.conf;
+}

containers/rsync/Dockerfile

@@ -0,0 +1,6 @@
+FROM ghcr.io/ajayyy/sb-server:latest
+EXPOSE 873/tcp
+RUN apk add rsync>3.4.1-r0
+RUN mkdir /usr/src/app/database-export
+
+CMD rsync --no-detach --daemon & ./entrypoint.sh

databases/_private.db.sql

@@ -1,8 +1,5 @@
 BEGIN TRANSACTION;
 
-CREATE TABLE IF NOT EXISTS "shadowBannedUsers" (
-	"userID"	TEXT NOT NULL
-);
 CREATE TABLE IF NOT EXISTS "votes" (
 	"UUID"	TEXT NOT NULL,
 	"userID"	TEXT NOT NULL,
@@ -29,7 +26,33 @@ CREATE TABLE IF NOT EXISTS "config" (
 	"value" TEXT NOT NULL
 );
 
-CREATE INDEX IF NOT EXISTS sponsorTimes_hashedIP on sponsorTimes(hashedIP);
-CREATE INDEX IF NOT EXISTS votes_userID on votes(UUID);
+CREATE TABLE IF NOT EXISTS "titleVotes" (
+	"id" SERIAL PRIMARY KEY,
+	"videoID"	TEXT NOT NULL,
+	"UUID"	TEXT NOT NULL,
+	"userID"	TEXT NOT NULL,
+	"hashedIP"	TEXT NOT NULL,
+	"type"	INTEGER NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "thumbnailVotes" (
+	"id" SERIAL PRIMARY KEY,
+	"videoID"	TEXT NOT NULL,
+	"UUID"	TEXT NOT NULL,
+	"userID"	TEXT NOT NULL,
+	"hashedIP"	TEXT NOT NULL,
+	"type"	INTEGER NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "casualVotes" (
+	"UUID" SERIAL PRIMARY KEY,
+	"videoID"	TEXT NOT NULL,
+	"service"	TEXT NOT NULL,
+	"userID"	TEXT NOT NULL,
+	"hashedIP"	TEXT NOT NULL,
+	"category"	TEXT NOT NULL,
+	"type"	INTEGER NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL
+);
 
 COMMIT;

databases/_private_indexes.sql

@@ -0,0 +1,38 @@
+-- sponsorTimes
+
+CREATE INDEX IF NOT EXISTS "privateDB_sponsorTimes_v4"
+    ON public."sponsorTimes" USING btree
+    ("videoID" ASC NULLS LAST, service COLLATE pg_catalog."default" ASC NULLS LAST, "timeSubmitted" ASC NULLS LAST);
+
+-- votes
+
+CREATE INDEX IF NOT EXISTS "votes_userID"
+    ON public.votes USING btree
+    ("UUID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- categoryVotes
+
+CREATE INDEX IF NOT EXISTS "categoryVotes_UUID"
+    ON public."categoryVotes" USING btree
+    ("UUID" COLLATE pg_catalog."default" ASC NULLS LAST, "userID" COLLATE pg_catalog."default" ASC NULLS LAST, "hashedIP" COLLATE pg_catalog."default" ASC NULLS LAST, category COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- ratings
+
+CREATE INDEX IF NOT EXISTS "ratings_videoID"
+    ON public."ratings" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, service COLLATE pg_catalog."default" ASC NULLS LAST, "userID" COLLATE pg_catalog."default" ASC NULLS LAST, "timeSubmitted" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- casualVotes
+
+CREATE INDEX IF NOT EXISTS "casualVotes_videoID"
+    ON public."casualVotes" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "service" COLLATE pg_catalog."default" ASC NULLS LAST, "userID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "casualVotes_userID"
+    ON public."casualVotes" USING btree
+    ("userID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;

databases/_sponsorTimes.db.sql

@@ -3,6 +3,11 @@ BEGIN TRANSACTION;
 CREATE TABLE IF NOT EXISTS "vipUsers" (
 	"userID"	TEXT NOT NULL
 );
+
+COMMIT;
+
+BEGIN TRANSACTION;
+
 CREATE TABLE IF NOT EXISTS "sponsorTimes" (
 	"videoID"	TEXT NOT NULL,
 	"startTime"	REAL NOT NULL,
@@ -12,25 +17,94 @@ CREATE TABLE IF NOT EXISTS "sponsorTimes" (
 	"userID"	TEXT NOT NULL,
 	"timeSubmitted"	INTEGER NOT NULL,
 	"views"	INTEGER NOT NULL,
-    "category" TEXT NOT NULL,
+	"category" TEXT NOT NULL,
 	"shadowHidden"	INTEGER NOT NULL
 );
+
 CREATE TABLE IF NOT EXISTS "userNames" (
 	"userID"	TEXT NOT NULL,
 	"userName"	TEXT NOT NULL
 );
+
 CREATE TABLE IF NOT EXISTS "categoryVotes" (
 	"UUID"	TEXT NOT NULL,
 	"category"	TEXT NOT NULL,
-	"votes"	INTEGER NOT NULL default '0'
+	"votes"	INTEGER NOT NULL default 0
+);
+
+CREATE TABLE IF NOT EXISTS "shadowBannedIPs" (
+	"hashedIP"	TEXT NOT NULL PRIMARY KEY
 );
 
 CREATE TABLE IF NOT EXISTS "config" (
-    "key" TEXT NOT NULL UNIQUE,
+	"key" TEXT NOT NULL UNIQUE,
 	"value" TEXT NOT NULL
 );
 
-CREATE INDEX IF NOT EXISTS sponsorTimes_videoID on sponsorTimes(videoID);
-CREATE INDEX IF NOT EXISTS sponsorTimes_UUID on sponsorTimes(UUID);
+CREATE TABLE IF NOT EXISTS "titles" (
+	"videoID"	TEXT NOT NULL,
+	"title"	TEXT NOT NULL,
+	"original" INTEGER default 0,
+	"userID"	TEXT NOT NULL,
+	"service"	TEXT NOT NULL,
+	"hashedVideoID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"UUID"	TEXT NOT NULL PRIMARY KEY
+);
+
+CREATE TABLE IF NOT EXISTS "titleVotes" (
+	"UUID"	TEXT NOT NULL PRIMARY KEY,
+	"votes"	INTEGER NOT NULL default 0,
+	"locked"	INTEGER NOT NULL default 0,
+	"shadowHidden"	INTEGER NOT NULL default 0,
+	FOREIGN KEY("UUID") REFERENCES "titles"("UUID")
+);
+
+CREATE TABLE IF NOT EXISTS "thumbnails" (
+	"videoID"	TEXT NOT NULL,
+	"original" INTEGER default 0,
+	"userID"	TEXT NOT NULL,
+	"service"	TEXT NOT NULL,
+	"hashedVideoID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"UUID"	TEXT NOT NULL PRIMARY KEY
+);
+
+CREATE TABLE IF NOT EXISTS "thumbnailTimestamps" (
+	"UUID"	TEXT NOT NULL PRIMARY KEY,
+	"timestamp"	INTEGER NOT NULL default 0,
+	FOREIGN KEY("UUID") REFERENCES "thumbnails"("UUID")
+);
+
+CREATE TABLE IF NOT EXISTS "thumbnailVotes" (
+	"UUID"	TEXT NOT NULL PRIMARY KEY,
+	"votes"	INTEGER NOT NULL default 0,
+	"locked"	INTEGER NOT NULL default 0,
+	"shadowHidden"	INTEGER NOT NULL default 0,
+	FOREIGN KEY("UUID") REFERENCES "thumbnails"("UUID")
+);
+
+CREATE TABLE IF NOT EXISTS "casualVotes" (
+	"UUID" TEXT PRIMARY KEY,
+	"videoID"	TEXT NOT NULL,
+	"service"	TEXT NOT NULL,
+	"hashedVideoID"	TEXT NOT NULL,
+	"category" TEXT NOT NULL,
+	"upvotes"	INTEGER NOT NULL default 0,
+	"downvotes"	INTEGER NOT NULL default 0,
+	"timeSubmitted"	INTEGER NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "casualVoteTitles" (
+	"videoID"	TEXT NOT NULL,
+	"service"	TEXT NOT NULL,
+	"id"	INTEGER NOT NULL,
+	"hashedVideoID"	TEXT NOT NULL,
+	"title" TEXT NOT NULL,
+	PRIMARY KEY("videoID", "service", "id")
+);
+
+CREATE EXTENSION IF NOT EXISTS pgcrypto; --!sqlite-ignore
+CREATE EXTENSION IF NOT EXISTS pg_trgm; --!sqlite-ignore
 
 COMMIT;

databases/_sponsorTimes_indexes.sql

@@ -0,0 +1,198 @@
+-- sponsorTimes
+
+CREATE INDEX IF NOT EXISTS "sponsorTime_timeSubmitted"
+    ON public."sponsorTimes" USING btree
+    ("timeSubmitted" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "sponsorTime_userID"
+    ON public."sponsorTimes" USING btree
+    ("userID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "sponsorTimes_UUID"
+    ON public."sponsorTimes" USING btree
+    ("UUID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "sponsorTimes_hashedVideoID"
+    ON public."sponsorTimes" USING btree
+    (service COLLATE pg_catalog."default" ASC NULLS LAST, "hashedVideoID" text_pattern_ops ASC NULLS LAST, "startTime" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "sponsorTimes_videoID"
+    ON public."sponsorTimes" USING btree
+    (service COLLATE pg_catalog."default" ASC NULLS LAST, "videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "startTime" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "sponsorTimes_videoID_category"
+    ON public."sponsorTimes" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "category" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "sponsorTimes_description_gin"
+    ON public."sponsorTimes" USING gin
+    ("description" COLLATE pg_catalog."default" gin_trgm_ops, category COLLATE pg_catalog."default" gin_trgm_ops)
+    TABLESPACE pg_default;
+
+-- userNames
+
+CREATE INDEX IF NOT EXISTS "userNames_userID"
+    ON public."userNames" USING btree
+    ("userID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- vipUsers
+
+CREATE INDEX IF NOT EXISTS "vipUsers_index"
+    ON public."vipUsers" USING btree
+    ("userID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- warnings
+
+CREATE INDEX IF NOT EXISTS "warnings_index"
+    ON public.warnings USING btree
+    ("userID" COLLATE pg_catalog."default" ASC NULLS LAST, "issueTime" DESC NULLS LAST, enabled DESC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "warnings_issueTime"
+    ON public.warnings USING btree
+    ("issueTime" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- lockCategories
+
+CREATE INDEX IF NOT EXISTS "lockCategories_videoID"
+    ON public."lockCategories" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, service COLLATE pg_catalog."default" ASC NULLS LAST, category COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- categoryVotes
+
+CREATE INDEX IF NOT EXISTS "categoryVotes_UUID_public"
+    ON public."categoryVotes" USING btree
+    ("UUID" COLLATE pg_catalog."default" ASC NULLS LAST, category COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- shadowBannedUsers
+
+CREATE INDEX IF NOT EXISTS "shadowBannedUsers_index"
+    ON public."shadowBannedUsers" USING btree
+    ("userID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- videoInfo
+CREATE INDEX IF NOT EXISTS "videoInfo_videoID"
+    ON public."videoInfo" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "videoInfo_channelID"
+    ON public."videoInfo" USING btree
+    ("channelID" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- ratings
+
+CREATE INDEX IF NOT EXISTS "ratings_hashedVideoID_gin"
+    ON public."ratings" USING gin
+    ("hashedVideoID" COLLATE pg_catalog."default" gin_trgm_ops)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "ratings_hashedVideoID"
+    ON public."ratings" USING btree
+    ("hashedVideoID" COLLATE pg_catalog."default" ASC NULLS LAST, service COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "ratings_videoID"
+    ON public."ratings" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, service COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+--- userFeatures
+
+CREATE INDEX IF NOT EXISTS "userFeatures_userID"
+    ON public."userFeatures" USING btree
+    ("userID" COLLATE pg_catalog."default" ASC NULLS LAST, "feature" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- titles
+
+CREATE INDEX IF NOT EXISTS "titles_timeSubmitted"
+    ON public."titles" USING btree
+    ("timeSubmitted" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "titles_userID_timeSubmitted"
+    ON public."titles" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "service" COLLATE pg_catalog."default" ASC NULLS LAST, "userID" COLLATE pg_catalog."default" DESC NULLS LAST, "timeSubmitted" DESC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "titles_videoID"
+    ON public."titles" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "service" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "titles_hashedVideoID_2"
+    ON public."titles" USING btree
+    (service COLLATE pg_catalog."default" ASC NULLS LAST, "hashedVideoID" text_pattern_ops ASC NULLS LAST, "timeSubmitted" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- titleVotes
+
+CREATE INDEX IF NOT EXISTS "titleVotes_votes"
+    ON public."titleVotes" USING btree
+    ("UUID" COLLATE pg_catalog."default" ASC NULLS LAST, "votes" DESC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- thumbnails
+
+CREATE INDEX IF NOT EXISTS "thumbnails_timeSubmitted"
+    ON public."thumbnails" USING btree
+    ("timeSubmitted" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "thumbnails_votes_timeSubmitted"
+    ON public."thumbnails" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "service" COLLATE pg_catalog."default" ASC NULLS LAST, "userID" COLLATE pg_catalog."default" DESC NULLS LAST, "timeSubmitted" DESC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "thumbnails_videoID"
+    ON public."thumbnails" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "service" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "thumbnails_hashedVideoID_2"
+    ON public."thumbnails" USING btree
+    (service COLLATE pg_catalog."default" ASC NULLS LAST, "hashedVideoID" text_pattern_ops ASC NULLS LAST, "timeSubmitted" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- thumbnailVotes
+
+CREATE INDEX IF NOT EXISTS "thumbnailVotes_votes"
+    ON public."thumbnailVotes" USING btree
+    ("UUID" COLLATE pg_catalog."default" ASC NULLS LAST, "votes" DESC NULLS LAST)
+    TABLESPACE pg_default;
+
+-- casualVotes
+
+CREATE INDEX IF NOT EXISTS "casualVotes_timeSubmitted"
+    ON public."casualVotes" USING btree
+    ("timeSubmitted" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "casualVotes_userID_timeSubmitted"
+    ON public."casualVotes" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "service" COLLATE pg_catalog."default" ASC NULLS LAST, "timeSubmitted" DESC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "casualVotes_videoID"
+    ON public."casualVotes" USING btree
+    ("videoID" COLLATE pg_catalog."default" ASC NULLS LAST, "service" COLLATE pg_catalog."default" ASC NULLS LAST)
+    TABLESPACE pg_default;
+
+CREATE INDEX IF NOT EXISTS "casualVotes_hashedVideoID_2"
+    ON public."casualVotes" USING btree
+    (service COLLATE pg_catalog."default" ASC NULLS LAST, "hashedVideoID" text_pattern_ops ASC NULLS LAST, "timeSubmitted" ASC NULLS LAST)
+    TABLESPACE pg_default;

databases/_upgrade_private_1.sql

@@ -3,6 +3,6 @@ BEGIN TRANSACTION;
 /* for testing the db upgrade, don't remove because it looks empty */
 
 /* Add version to config */
-INSERT INTO config (key, value) VALUES("version", 1);
+INSERT INTO config (key, value) VALUES('version', 1);
 
 COMMIT;

databases/_upgrade_private_10.sql

@@ -0,0 +1,9 @@
+BEGIN TRANSACTION;
+
+-- Add primary keys
+
+ALTER TABLE "votes" ADD "originalType" INTEGER NOT NULL default -1;
+
+UPDATE "config" SET value = 10 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_11.sql

@@ -0,0 +1,18 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "licenseKeys" (
+	"licenseKey"		TEXT NOT NULL PRIMARY KEY,
+	"time"		        INTEGER NOT NULL,
+	"type"			    TEXT NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "oauthLicenseKeys" (
+	"licenseKey"		TEXT NOT NULL PRIMARY KEY,
+    "accessToken"		TEXT NOT NULL,
+    "refreshToken"	    TEXT NOT NULL,
+    "expiresIn"		    INTEGER NOT NULL
+);
+
+UPDATE "config" SET value = 11 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_12.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "casualVotes" DROP COLUMN "type";
+
+UPDATE "config" SET value = 12 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_13.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "casualVotes" ADD "titleID" INTEGER default 0;
+
+UPDATE "config" SET value = 13 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_2.sql

@@ -0,0 +1,13 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "userNameLogs" (
+	"userID"	TEXT NOT NULL,
+	"newUserName"	TEXT NOT NULL,
+	"oldUserName"	TEXT NOT NULL,
+	"updatedByAdmin"	BOOLEAN NOT NULL,
+	"updatedAt"	INTEGER NOT NULL
+);
+
+UPDATE "config" SET value = 2 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_3.sql

@@ -0,0 +1,10 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "sponsorTimes" ADD "service" TEXT NOT NULL default 'YouTube';
+-- UPDATE "sponsorTimes" SET "service" = "YouTube";
+
+DROP INDEX IF EXISTS "privateDB_sponsorTimes_videoID";
+
+UPDATE "config" SET value = 3 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_4.sql

@@ -0,0 +1,14 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "ratings" (
+	"videoID"		TEXT NOT NULL,
+	"service"		TEXT NOT NULL default 'YouTube',
+	"type"			INTEGER NOT NULL,
+	"userID"		TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"hashedIP"		TEXT NOT NULL
+);
+
+UPDATE "config" SET value = 4 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_5.sql

@@ -0,0 +1,12 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "tempVipLog" (
+	"issuerUserID"	TEXT NOT NULL,
+	"targetUserID"	TEXT NOT NULL,
+	"enabled"				BOOLEAN NOT NULL,
+	"updatedAt"			INTEGER NOT NULL
+);
+
+UPDATE "config" SET value = 5 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_6.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+DROP INDEX IF EXISTS "sponsorTimes_hashedIP", "privateDB_sponsorTimes_videoID_v2"; --!sqlite-ignore
+
+UPDATE "config" SET value = 6 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_7.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "votes" ADD "normalUserID" TEXT NOT NULL default '';
+
+UPDATE "config" SET value = 7 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_8.sql

@@ -0,0 +1,15 @@
+BEGIN TRANSACTION;
+
+-- Add primary keys
+
+ALTER TABLE "userNameLogs" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "categoryVotes" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "sponsorTimes" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "config" ADD PRIMARY KEY ("key"); --!sqlite-ignore
+ALTER TABLE "ratings" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "tempVipLog" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "votes" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+
+UPDATE "config" SET value = 8 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_private_9.sql

@@ -0,0 +1,9 @@
+BEGIN TRANSACTION;
+
+-- Add primary keys
+
+DROP INDEX IF EXISTS "privateDB_sponsorTimes_v3"; --!sqlite-ignore
+
+UPDATE "config" SET value = 9 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_1.sql

@@ -6,20 +6,20 @@ CREATE TABLE "sqlb_temp_table_1" (
 	"startTime"	REAL NOT NULL,
 	"endTime"	REAL NOT NULL,
 	"votes"	INTEGER NOT NULL,
-    "incorrectVotes" INTEGER NOT NULL default '1',
+	"incorrectVotes" INTEGER NOT NULL default 1,
 	"UUID"	TEXT NOT NULL UNIQUE,
 	"userID"	TEXT NOT NULL,
 	"timeSubmitted"	INTEGER NOT NULL,
 	"views"	INTEGER NOT NULL,
-	"category"	TEXT NOT NULL DEFAULT "sponsor",
+	"category"	TEXT NOT NULL DEFAULT 'sponsor',
 	"shadowHidden"	INTEGER NOT NULL
 );
-INSERT INTO sqlb_temp_table_1 SELECT videoID,startTime,endTime,votes,"1",UUID,userID,timeSubmitted,views,category,shadowHidden FROM sponsorTimes;
+INSERT INTO sqlb_temp_table_1 SELECT "videoID","startTime","endTime","votes",'1',"UUID","userID","timeSubmitted","views","category","shadowHidden" FROM "sponsorTimes";
 
-DROP TABLE sponsorTimes;
+DROP TABLE "sponsorTimes";
 ALTER TABLE sqlb_temp_table_1 RENAME TO "sponsorTimes";
 
 /* Add version to config */
-INSERT INTO config (key, value) VALUES("version", 1);
+INSERT INTO config (key, value) VALUES('version', 1);
 
 COMMIT;

databases/_upgrade_sponsorTimes_10.sql

@@ -0,0 +1,30 @@
+BEGIN TRANSACTION;
+
+/* Add Hidden field */
+CREATE TABLE "sqlb_temp_table_10" (
+	"videoID"	TEXT NOT NULL,
+	"startTime"	REAL NOT NULL,
+	"endTime"	REAL NOT NULL,
+	"votes"	INTEGER NOT NULL,
+	"locked" INTEGER NOT NULL default '0',
+	"incorrectVotes" INTEGER NOT NULL default '1',
+	"UUID"	TEXT NOT NULL UNIQUE,
+	"userID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"views"	INTEGER NOT NULL,
+	"category"	TEXT NOT NULL DEFAULT 'sponsor',
+	"service"	TEXT NOT NULL DEFAULT 'YouTube',
+	"videoDuration"	REAL NOT NULL DEFAULT '0',
+	"hidden"	INTEGER NOT NULL DEFAULT '0',
+	"shadowHidden"	INTEGER NOT NULL,
+	"hashedVideoID" TEXT NOT NULL default ''
+);
+
+INSERT INTO sqlb_temp_table_10 SELECT "videoID","startTime","endTime","votes","locked","incorrectVotes","UUID","userID","timeSubmitted","views","category","service","videoDuration",0,"shadowHidden","hashedVideoID" FROM "sponsorTimes";
+
+DROP TABLE "sponsorTimes";
+ALTER TABLE sqlb_temp_table_10 RENAME TO "sponsorTimes";
+
+UPDATE "config" SET value = 10 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_11.sql

@@ -0,0 +1,8 @@
+BEGIN TRANSACTION;
+
+/* Rename table: noSegments to lockCategories */
+ALTER TABLE "noSegments" RENAME TO "lockCategories";
+
+UPDATE "config" SET value = 11 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_12.sql

@@ -0,0 +1,31 @@
+BEGIN TRANSACTION;
+
+/* Add reputation field */
+CREATE TABLE "sqlb_temp_table_12" (
+	"videoID"	TEXT NOT NULL,
+	"startTime"	REAL NOT NULL,
+	"endTime"	REAL NOT NULL,
+	"votes"	INTEGER NOT NULL,
+	"locked" INTEGER NOT NULL default '0',
+	"incorrectVotes" INTEGER NOT NULL default '1',
+	"UUID"	TEXT NOT NULL UNIQUE,
+	"userID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"views"	INTEGER NOT NULL,
+	"category"	TEXT NOT NULL DEFAULT 'sponsor',
+	"service"	TEXT NOT NULL DEFAULT 'YouTube',
+	"videoDuration"	REAL NOT NULL DEFAULT '0',
+	"hidden"	INTEGER NOT NULL DEFAULT '0',
+	"reputation" REAL NOT NULL DEFAULT 0,
+	"shadowHidden"	INTEGER NOT NULL,
+	"hashedVideoID" TEXT NOT NULL default ''
+);
+
+INSERT INTO sqlb_temp_table_12 SELECT "videoID","startTime","endTime","votes","locked","incorrectVotes","UUID","userID","timeSubmitted","views","category","service","videoDuration","hidden",0,"shadowHidden","hashedVideoID" FROM "sponsorTimes";
+
+DROP TABLE "sponsorTimes";
+ALTER TABLE sqlb_temp_table_12 RENAME TO "sponsorTimes";
+
+UPDATE "config" SET value = 12 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_13.sql

@@ -0,0 +1,17 @@
+BEGIN TRANSACTION;
+
+/* Add locked field */
+CREATE TABLE "sqlb_temp_table_13" (
+	"userID"	TEXT NOT NULL,
+	"userName"	TEXT NOT NULL,
+	"locked" INTEGER NOT NULL default '0'
+);
+
+INSERT INTO sqlb_temp_table_13 SELECT "userID", "userName", 0 FROM "userNames";
+
+DROP TABLE "userNames";
+ALTER TABLE sqlb_temp_table_13 RENAME TO "userNames";
+
+UPDATE "config" SET value = 13 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_14.sql

@@ -0,0 +1,9 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "shadowBannedUsers" (
+	"userID"	TEXT NOT NULL
+);
+
+UPDATE "config" SET value = 14 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_15.sql

@@ -0,0 +1,10 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "unlistedVideos" (
+	"videoID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL
+);
+
+UPDATE "config" SET value = 15 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_16.sql

@@ -0,0 +1,15 @@
+BEGIN TRANSACTION;
+
+DROP TABLE "unlistedVideos";
+
+CREATE TABLE IF NOT EXISTS "unlistedVideos" (
+	"videoID"	TEXT NOT NULL,
+	"year"	TEXT NOT NULL,
+	"views"	TEXT NOT NULL,
+	"channelID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL
+);
+
+UPDATE "config" SET value = 16 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_17.sql

@@ -0,0 +1,19 @@
+BEGIN TRANSACTION;
+
+/* Add reason field */
+CREATE TABLE "sqlb_temp_table_17" (
+	"userID" TEXT NOT NULL,
+	"issueTime" INTEGER NOT NULL,
+	"issuerUserID" TEXT NOT NULL,
+	enabled INTEGER NOT NULL,
+	"reason" TEXT NOT NULL default ''
+);
+
+INSERT INTO sqlb_temp_table_17 SELECT "userID","issueTime","issuerUserID","enabled", '' FROM "warnings";
+
+DROP TABLE warnings;
+ALTER TABLE sqlb_temp_table_17 RENAME TO "warnings";
+
+UPDATE "config" SET value = 17 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_18.sql

@@ -0,0 +1,9 @@
+BEGIN TRANSACTION;
+
+/* Add hash field */
+ALTER TABLE "lockCategories" ADD "hashedVideoID" TEXT NOT NULL default '';
+UPDATE "lockCategories" SET "hashedVideoID" = sha256("videoID");
+
+UPDATE "config" SET value = 18 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_19.sql

@@ -0,0 +1,32 @@
+BEGIN TRANSACTION;
+
+/* Add actionType field */
+CREATE TABLE "sqlb_temp_table_19" (
+	"videoID"	TEXT NOT NULL,
+	"startTime"	REAL NOT NULL,
+	"endTime"	REAL NOT NULL,
+	"votes"	INTEGER NOT NULL,
+	"locked" INTEGER NOT NULL default '0',
+	"incorrectVotes" INTEGER NOT NULL default '1',
+	"UUID"	TEXT NOT NULL UNIQUE,
+	"userID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"views"	INTEGER NOT NULL,
+	"category"	TEXT NOT NULL DEFAULT 'sponsor',
+	"actionType"	TEXT NOT NULL DEFAULT 'skip',
+	"service"	TEXT NOT NULL DEFAULT 'YouTube',
+	"videoDuration"	REAL NOT NULL DEFAULT '0',
+	"hidden"	INTEGER NOT NULL DEFAULT '0',
+	"reputation" REAL NOT NULL DEFAULT 0,
+	"shadowHidden"	INTEGER NOT NULL,
+	"hashedVideoID" TEXT NOT NULL default ''
+);
+
+INSERT INTO sqlb_temp_table_19 SELECT "videoID","startTime","endTime","votes","locked","incorrectVotes","UUID","userID","timeSubmitted","views","category",'skip',"service","videoDuration","hidden","reputation","shadowHidden","hashedVideoID" FROM "sponsorTimes";
+
+DROP TABLE "sponsorTimes";
+ALTER TABLE sqlb_temp_table_19 RENAME TO "sponsorTimes";
+
+UPDATE "config" SET value = 19 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_2.sql

@@ -8,6 +8,6 @@ CREATE TABLE "noSegments" (
 );
 
 /* Add version to config */
-UPDATE config SET value = 2 WHERE key = 'version';
+UPDATE "config" SET value = 2 WHERE key = 'version';
 
 COMMIT;

databases/_upgrade_sponsorTimes_20.sql

@@ -0,0 +1,8 @@
+BEGIN TRANSACTION;
+
+/* Add hash field */
+ALTER TABLE "lockCategories" ADD "reason" TEXT NOT NULL default '';
+
+UPDATE "config" SET value = 20 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_21.sql

@@ -0,0 +1,26 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "archivedSponsorTimes" (
+	"videoID" TEXT NOT NULL,
+	"startTime" REAL NOT NULL,
+	"endTime" REAL NOT NULL,
+	"votes" INTEGER NOT NULL,
+	"locked" INTEGER NOT NULL DEFAULT '0',
+	"incorrectVotes" INTEGER NOT NULL DEFAULT 1,
+	"UUID" TEXT NOT NULL UNIQUE,
+	"userID" TEXT NOT NULL,
+	"timeSubmitted" INTEGER NOT NULL,
+	"views" INTEGER NOT NULL,
+	"category" TEXT NOT NULL DEFAULT 'sponsor',
+	"service" TEXT NOT NULL DEFAULT 'Youtube',
+	"actionType" TEXT NOT NULL DEFAULT 'skip',
+	"videoDuration" INTEGER NOT NULL DEFAULT '0',
+	"hidden" INTEGER NOT NULL DEFAULT '0',
+	"reputation" REAL NOT NULL DEFAULT '0',
+	"shadowHidden" INTEGER NOT NULL,
+	"hashedVideoID" TEXT NOT NULL DEFAULT ''
+);
+
+UPDATE "config" SET value = 21 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_22.sql

@@ -0,0 +1,10 @@
+BEGIN TRANSACTION;
+
+/* Add hash field */
+ALTER TABLE "sponsorTimes" ADD "userAgent" TEXT NOT NULL default '';
+
+ALTER TABLE "archivedSponsorTimes" ADD "userAgent" TEXT NOT NULL default '';
+
+UPDATE "config" SET value = 22 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_23.sql

@@ -0,0 +1,12 @@
+BEGIN TRANSACTION;
+
+DELETE FROM "userNames" WHERE ctid NOT IN ( --!sqlite-ignore
+    SELECT MIN(ctid) FROM "userNames"       --!sqlite-ignore
+    GROUP BY "userID"                       --!sqlite-ignore
+);                                          --!sqlite-ignore
+
+ALTER TABLE "userNames" ADD UNIQUE("userID");   --!sqlite-ignore
+
+UPDATE "config" SET value = 23 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_24.sql

@@ -0,0 +1,21 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "lockCategories" ADD "service" TEXT NOT NULL default 'YouTube';
+
+UPDATE "lockCategories" 
+SET "service" = "sponsorTimes"."service" 
+FROM "sponsorTimes" 
+WHERE "lockCategories"."videoID" = "sponsorTimes"."videoID";
+
+ALTER TABLE "unlistedVideos" ADD "service" TEXT NOT NULL default 'YouTube';
+
+UPDATE "unlistedVideos" 
+SET "service" = "sponsorTimes"."service" 
+FROM "sponsorTimes"
+WHERE "unlistedVideos"."videoID" = "sponsorTimes"."videoID";
+
+DROP INDEX IF EXISTS "noSegments_videoID";
+
+UPDATE "config" SET value = 24 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_25.sql

@@ -0,0 +1,13 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "videoInfo" (
+	"videoID"	TEXT PRIMARY KEY NOT NULL,
+	"channelID"	TEXT NOT NULL,
+	"title"	    TEXT NOT NULL,
+	"published"	REAL NOT NULL,
+	"genreUrl"	REAL NOT NULL
+);
+
+UPDATE "config" SET value = 25 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_26.sql

@@ -0,0 +1,18 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE "sqlb_temp_table_26" (
+	"videoID"	TEXT PRIMARY KEY NOT NULL,
+	"channelID"	TEXT NOT NULL,
+	"title"	    TEXT NOT NULL,
+	"published"	REAL NOT NULL,
+	"genreUrl"	TEXT NOT NULL
+);
+
+INSERT INTO sqlb_temp_table_26 SELECT "videoID", "channelID", "title", "published", '' FROM "videoInfo";
+
+DROP TABLE "videoInfo";
+ALTER TABLE sqlb_temp_table_26 RENAME TO "videoInfo";
+
+UPDATE "config" SET value = 26 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_27.sql

@@ -0,0 +1,8 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "sponsorTimes" ADD "description" TEXT NOT NULL default '';
+ALTER TABLE "archivedSponsorTimes" ADD "description" TEXT NOT NULL default '';
+
+UPDATE "config" SET value = 27 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_28.sql

@@ -0,0 +1,13 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "ratings" (
+	"videoID"	    TEXT NOT NULL,
+	"service"	    TEXT NOT NULL default 'YouTube',
+	"type"	        INTEGER NOT NULL,
+	"count"	        INTEGER NOT NULL,
+	"hashedVideoID"	TEXT NOT NULL
+);
+
+UPDATE "config" SET value = 28 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_29.sql

@@ -0,0 +1,21 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE "sqlb_temp_table_29" (
+	"videoID"		TEXT NOT NULL,
+	"userID"		TEXT NOT NULL,
+	"actionType"	TEXT NOT NULL DEFAULT 'skip',
+	"category"		TEXT NOT NULL,
+	"hashedVideoID" TEXT NOT NULL default '',
+	"reason" 		TEXT NOT NULL default '',
+	"service"		TEXT NOT NULL default 'YouTube'
+);
+
+INSERT INTO sqlb_temp_table_29 SELECT "videoID","userID",'skip',"category","hashedVideoID","reason","service" FROM "lockCategories";
+INSERT INTO sqlb_temp_table_29 SELECT "videoID","userID",'mute',"category","hashedVideoID","reason","service" FROM "lockCategories";
+
+DROP TABLE "lockCategories";
+ALTER TABLE sqlb_temp_table_29 RENAME TO "lockCategories";
+
+UPDATE "config" SET value = 29 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_3.sql

@@ -1,13 +1,11 @@
 BEGIN TRANSACTION;
 
-/* hash upgrade test sha256('vid') = '1ff838dc6ca9680d88455341118157d59a055fe6d0e3870f9c002847bebe4663' 
+/* hash upgrade test sha256('vid') = '1ff838dc6ca9680d88455341118157d59a055fe6d0e3870f9c002847bebe4663' */
 /* Add hash field */
-ALTER TABLE sponsorTimes ADD hashedVideoID TEXT NOT NULL default "";
-UPDATE sponsorTimes SET hashedVideoID = sha256(videoID);
-
-CREATE INDEX IF NOT EXISTS sponsorTimes_hashedVideoID on sponsorTimes(hashedVideoID);
+ALTER TABLE "sponsorTimes" ADD "hashedVideoID" TEXT NOT NULL default '';
+UPDATE "sponsorTimes" SET "hashedVideoID" = sha256("videoID");
 
 /* Bump version in config */
-UPDATE config SET value = 3 WHERE key = "version";
+UPDATE "config" SET value = 3 WHERE key = 'version';
 
 COMMIT;

databases/_upgrade_sponsorTimes_30.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+UPDATE "sponsorTimes" SET "actionType" = 'poi' WHERE "category" = 'poi_highlight';
+
+UPDATE "config" SET value = 30 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_31.sql

@@ -0,0 +1,25 @@
+BEGIN TRANSACTION;
+
+/* START lockCategory migrations
+no sponsor migrations
+no selfpromo migrations */
+
+/* exclusive_access migrations */
+DELETE FROM "lockCategories" WHERE "category" = 'exclusive_access' AND "actionType" != 'full';
+/* delete all full locks on categories without full */
+DELETE FROM "lockCategories" WHERE "actionType" = 'full' AND "category" in ('interaction', 'intro', 'outro', 'preview', 'filler', 'music_offtopic', 'poi_highlight');
+/* delete all non-skip music_offtopic locks */
+DELETE FROM "lockCategories" WHERE "category" = 'music_offtopic' AND "actionType" != 'skip';
+/* convert all poi_highlight to actionType poi */
+UPDATE "lockCategories" SET "actionType" = 'poi' WHERE "category" = 'poi_highlight' AND "actionType" = 'skip';
+/* delete all non-skip poi_highlight locks */
+DELETE FROM "lockCategories" WHERE "category" = 'poi_highlight' AND "actionType" != 'poi';
+
+/* END lockCategory migrations */
+
+/* delete all redundant userName entries */
+DELETE FROM "userNames" WHERE "userName" = "userID" AND "locked" = 0;
+
+UPDATE "config" SET value = 31 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_32.sql

@@ -0,0 +1,19 @@
+BEGIN TRANSACTION;
+
+-- Add primary keys
+
+ALTER TABLE "sponsorTimes" ADD PRIMARY KEY ("UUID"); --!sqlite-ignore
+ALTER TABLE "vipUsers" ADD PRIMARY KEY ("userID"); --!sqlite-ignore
+ALTER TABLE "userNames" ADD PRIMARY KEY ("userID"); --!sqlite-ignore
+ALTER TABLE "categoryVotes" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "lockCategories" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "warnings" ADD PRIMARY KEY ("userID", "issueTime"); --!sqlite-ignore
+ALTER TABLE "shadowBannedUsers" ADD PRIMARY KEY ("userID"); --!sqlite-ignore
+ALTER TABLE "unlistedVideos" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "config" ADD PRIMARY KEY ("key"); --!sqlite-ignore
+ALTER TABLE "archivedSponsorTimes" ADD PRIMARY KEY ("UUID"); --!sqlite-ignore
+ALTER TABLE "ratings" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+
+UPDATE "config" SET value = 32 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_33.sql

@@ -0,0 +1,13 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "userFeatures" (
+	"userID" TEXT NOT NULL,
+	"feature" INTEGER NOT NULL,
+    "issuerUserID" TEXT NOT NULL,
+    "timeSubmitted" INTEGER NOT NULL,
+    PRIMARY KEY ("userID", "feature")
+);
+
+UPDATE "config" SET value = 33 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_34.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "videoInfo" DROP COLUMN "genreUrl";
+
+UPDATE "config" SET value = 34 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_35.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "titleVotes" ADD "verification" INTEGER default 0;
+
+UPDATE "config" SET value = 35 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_36.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "warnings" ADD "type" INTEGER default 0;
+
+UPDATE "config" SET value = 36 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_37.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "titles" ADD UNIQUE ("videoID", "title"); --!sqlite-ignore
+
+UPDATE "config" SET value = 37 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_38.sql

@@ -0,0 +1,11 @@
+BEGIN TRANSACTION;
+
+UPDATE "titleVotes" SET "shadowHidden" = 1
+WHERE "UUID" IN (SELECT "UUID" FROM "titles" INNER JOIN "shadowBannedUsers" "bans" ON "titles"."userID" = "bans"."userID");
+
+UPDATE "thumbnailVotes" SET "shadowHidden" = 1
+WHERE "UUID" IN (SELECT "UUID" FROM "thumbnails" INNER JOIN "shadowBannedUsers" "bans" ON "thumbnails"."userID" = "bans"."userID");
+
+UPDATE "config" SET value = 38 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_39.sql

@@ -0,0 +1,11 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "titleVotes" ADD "downvotes" INTEGER default 0;
+ALTER TABLE "titleVotes" ADD "removed" INTEGER default 0;
+
+ALTER TABLE "thumbnailVotes" ADD "downvotes" INTEGER default 0;
+ALTER TABLE "thumbnailVotes" ADD "removed" INTEGER default 0;
+
+UPDATE "config" SET value = 39 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_4.sql

@@ -2,11 +2,11 @@ BEGIN TRANSACTION;
 
 /* Create warnings table */
 CREATE TABLE "warnings" (
-    userID TEXT NOT NULL,
-    issueTime INTEGER NOT NULL,
-    issuerUserID TEXT NOT NULL
+    "userID" TEXT NOT NULL,
+    "issueTime" INTEGER NOT NULL,
+    "issuerUserID" TEXT NOT NULL
 );
 
-UPDATE config SET value = 4 WHERE key = "version";
+UPDATE "config" SET value = 4 WHERE key = 'version';
 
 COMMIT;

databases/_upgrade_sponsorTimes_40.sql

@@ -0,0 +1,8 @@
+BEGIN TRANSACTION;
+
+DROP INDEX IF EXISTS "titles_hashedVideoID";
+DROP INDEX IF EXISTS "thumbnails_hashedVideoID";
+
+UPDATE "config" SET value = 40 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_41.sql

@@ -0,0 +1,8 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "titles" ADD "casualMode" INTEGER default 0;
+ALTER TABLE "thumbnails" ADD "casualMode" INTEGER default 0;
+
+UPDATE "config" SET value = 41 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_42.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "casualVotes" DROP COLUMN "downvotes";
+
+UPDATE "config" SET value = 42 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_43.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "casualVotes" ADD "titleID" INTEGER default 0;
+
+UPDATE "config" SET value = 43 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_44.sql

@@ -0,0 +1,8 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "titles" ADD "userAgent" TEXT NOT NULL default '';
+ALTER TABLE "thumbnails" ADD "userAgent" TEXT NOT NULL default '';
+
+UPDATE "config" SET value = 44 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_45.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE "warnings" ADD "disableTime" INTEGER NULL;
+
+UPDATE "config" SET value = 45 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_5.sql

@@ -0,0 +1,17 @@
+BEGIN TRANSACTION;
+
+/* Add enabled field */
+CREATE TABLE "sqlb_temp_table_5" (
+	"userID" TEXT NOT NULL,
+    "issueTime" INTEGER NOT NULL,
+    "issuerUserID" TEXT NOT NULL,
+    enabled INTEGER NOT NULL
+);
+INSERT INTO sqlb_temp_table_5 SELECT "userID","issueTime","issuerUserID",1 FROM "warnings";
+
+DROP TABLE warnings;
+ALTER TABLE sqlb_temp_table_5 RENAME TO "warnings";;
+
+UPDATE "config" SET value = 5 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_6.sql

@@ -0,0 +1,27 @@
+BEGIN TRANSACTION;
+
+/* Add 'locked' field */
+CREATE TABLE "sqlb_temp_table_6" (
+	"videoID"	TEXT NOT NULL,
+	"startTime"	REAL NOT NULL,
+	"endTime"	REAL NOT NULL,
+	"votes"	INTEGER NOT NULL,
+	"locked" INTEGER NOT NULL default '0',
+	"incorrectVotes" INTEGER NOT NULL default '1',
+	"UUID"	TEXT NOT NULL UNIQUE,
+	"userID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"views"	INTEGER NOT NULL,
+	"category"	TEXT NOT NULL DEFAULT 'sponsor',
+	"shadowHidden"	INTEGER NOT NULL,
+	"hashedVideoID" TEXT NOT NULL default ''
+);
+
+INSERT INTO sqlb_temp_table_6 SELECT "videoID","startTime","endTime","votes",'0',"incorrectVotes","UUID","userID","timeSubmitted","views","category","shadowHidden","hashedVideoID" FROM "sponsorTimes";
+
+DROP TABLE "sponsorTimes";
+ALTER TABLE sqlb_temp_table_6 RENAME TO "sponsorTimes";
+
+UPDATE "config" SET value = 6 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_7.sql

@@ -0,0 +1,28 @@
+BEGIN TRANSACTION;
+
+/* Add Service field */
+CREATE TABLE "sqlb_temp_table_7" (
+	"videoID"	TEXT NOT NULL,
+	"startTime"	REAL NOT NULL,
+	"endTime"	REAL NOT NULL,
+	"votes"	INTEGER NOT NULL,
+	"locked" INTEGER NOT NULL default '0',
+	"incorrectVotes" INTEGER NOT NULL default '1',
+	"UUID"	TEXT NOT NULL UNIQUE,
+	"userID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"views"	INTEGER NOT NULL,
+	"category"	TEXT NOT NULL DEFAULT 'sponsor',
+	"service"	TEXT NOT NULL DEFAULT 'YouTube',
+	"shadowHidden"	INTEGER NOT NULL,
+	"hashedVideoID" TEXT NOT NULL default ''
+);
+
+INSERT INTO sqlb_temp_table_7 SELECT "videoID","startTime","endTime","votes","locked","incorrectVotes","UUID","userID","timeSubmitted","views","category",'YouTube', "shadowHidden","hashedVideoID" FROM "sponsorTimes";
+
+DROP TABLE "sponsorTimes";
+ALTER TABLE sqlb_temp_table_7 RENAME TO "sponsorTimes";
+
+UPDATE "config" SET value = 7 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_8.sql

@@ -0,0 +1,29 @@
+BEGIN TRANSACTION;
+
+/* Add 'videoDuration' field */
+CREATE TABLE "sqlb_temp_table_8" (
+	"videoID"	TEXT NOT NULL,
+	"startTime"	REAL NOT NULL,
+	"endTime"	REAL NOT NULL,
+	"votes"	INTEGER NOT NULL,
+	"locked" INTEGER NOT NULL default '0',
+	"incorrectVotes" INTEGER NOT NULL default '1',
+	"UUID"	TEXT NOT NULL UNIQUE,
+	"userID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"views"	INTEGER NOT NULL,
+	"category"	TEXT NOT NULL DEFAULT 'sponsor',
+	"service"	TEXT NOT NULL DEFAULT 'YouTube',
+	"videoDuration"	INTEGER NOT NULL DEFAULT '0',
+	"shadowHidden"	INTEGER NOT NULL,
+	"hashedVideoID" TEXT NOT NULL default ''
+);
+
+INSERT INTO sqlb_temp_table_8 SELECT "videoID","startTime","endTime","votes","locked","incorrectVotes","UUID","userID","timeSubmitted","views","category","service",'0', "shadowHidden","hashedVideoID" FROM "sponsorTimes";
+
+DROP TABLE "sponsorTimes";
+ALTER TABLE sqlb_temp_table_8 RENAME TO "sponsorTimes";
+
+UPDATE "config" SET value = 8 WHERE key = 'version';
+
+COMMIT;

databases/_upgrade_sponsorTimes_9.sql

@@ -0,0 +1,29 @@
+BEGIN TRANSACTION;
+
+/* Change 'videoDuration' field from INTEGER to REAL */
+CREATE TABLE "sqlb_temp_table_9" (
+	"videoID"	TEXT NOT NULL,
+	"startTime"	REAL NOT NULL,
+	"endTime"	REAL NOT NULL,
+	"votes"	INTEGER NOT NULL,
+	"locked" INTEGER NOT NULL default '0',
+	"incorrectVotes" INTEGER NOT NULL default '1',
+	"UUID"	TEXT NOT NULL UNIQUE,
+	"userID"	TEXT NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL,
+	"views"	INTEGER NOT NULL,
+	"category"	TEXT NOT NULL DEFAULT 'sponsor',
+	"service"	TEXT NOT NULL DEFAULT 'YouTube',
+	"videoDuration"	REAL NOT NULL DEFAULT '0',
+	"shadowHidden"	INTEGER NOT NULL,
+	"hashedVideoID" TEXT NOT NULL default ''
+);
+
+INSERT INTO sqlb_temp_table_9 SELECT "videoID","startTime","endTime","votes","locked","incorrectVotes","UUID","userID","timeSubmitted","views","category","service",'0', "shadowHidden","hashedVideoID" FROM "sponsorTimes";
+
+DROP TABLE "sponsorTimes";
+ALTER TABLE sqlb_temp_table_9 RENAME TO "sponsorTimes";
+
+UPDATE "config" SET value = 9 WHERE key = 'version';
+
+COMMIT;

docker/database.env.example

@@ -0,0 +1,3 @@
+POSTGRES_USER=sponsorblock
+POSTGRES_PASSWORD=<choose-a-password>
+POSTGRES_DB=sponsorTimes

docker/docker-compose-ci.yml

@@ -0,0 +1,15 @@
+version: '3'
+services:
+  postgres:
+    container_name: database-co
+    image: postgres:alpine
+    environment:
+      - POSTGRES_USER=${PG_USER}
+      - POSTGRES_PASSWORD=${PG_PASS}
+    ports:
+      - 5432:5432
+  redis:
+    container_name: redis-ci
+    image: redis:alpine
+    ports:
+      - 6379:6379

docker/docker-compose.yml

@@ -0,0 +1,44 @@
+version: '3'
+services:
+  database:
+    container_name: database
+    image: postgres:14
+    env_file: 
+      - database.env
+    volumes:
+      - database-data:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    restart: always
+  redis:
+    container_name: redis
+    image: redis:7.0
+    command: /usr/local/etc/redis/redis.conf
+    volumes:
+      - ./redis/redis.conf:/usr/local/etc/redis/redis.conf
+    ports:
+      - 32773:6379
+    sysctls:
+      - net.core.somaxconn=324000
+      - net.ipv4.tcp_max_syn_backlog=3240000
+    restart: always
+  newleaf:
+    image: abeltramo/newleaf:latest
+    container_name: newleaf
+    restart: always
+    ports:
+      - 3241:3000
+    volumes:
+      - ./newleaf/configuration.py:/workdir/configuration.py
+  rsync:
+    image: mchangrh/rsync:latest
+    container_name: rsync
+    restart: always
+    ports:
+      - 873:873
+    volumes:
+      - ./rsync/rsyncd.conf:/etc/rsyncd.conf
+      - ./database-export/:/mirror
+
+volumes:
+  database-data:

docker/migrate/database.pgload.txt

@@ -0,0 +1,5 @@
+load database
+     from ./database.db
+     into postgresql://sponsorblock:pw@127.0.0.1:5432/sponsorTimes
+
+with quote identifiers;

docker/newleaf/configuration.py

@@ -0,0 +1,17 @@
+# ==============================
+#  You MUST set these settings.
+# ==============================
+
+# A URL that this site can be accessed on. Do not include a trailing slash.
+website_origin = "http://newleaf:3000"
+
+
+# ==============================
+#  These settings are optional.
+# ==============================
+
+# The address of the interface to bind to.
+#bind_host = "0.0.0.0"
+
+# The port to bind to.
+#bind_port = 3000

docker/redis/redis.conf

@@ -0,0 +1,5 @@
+maxmemory-policy allkeys-lru
+maxmemory 6000mb
+
+appendonly no
+save ""

docker/rsync/rsyncd.conf

@@ -0,0 +1,15 @@
+pid file = /var/run/rsyncd.pid
+lock file = /var/run/rsync.lock
+log file = /var/log/rsync.log
+# replace with user accessing the files
+
+[sponsorblock]
+use chroot = no
+max connections = 10
+# path to mirrored files
+path = /mirror
+comment = sponsorblock-database
+read only = true
+refuse options = c delete zl
+# disallow checksumming and compression level to reduce CPU/IO load
+# disallow deleting files clientside

entrypoint.sh

@@ -1,26 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 echo 'Entrypoint script'
 cd /usr/src/app
-cp /etc/sponsorblock/config.json . || cat <<EOF > config.json
+
+# blank config, use defaults
+test -e config.json || cat <<EOF > config.json
 {
-    "port": 8080,
-    "globalSalt": "[CHANGE THIS]",
-    "adminUserID": "[CHANGE THIS]",
-    "youtubeAPIKey": null,
-    "discordReportChannelWebhookURL": null, 
-    "discordFirstTimeSubmissionsWebhookURL": null, 
-    "discordAutoModWebhookURL": null,
-    "proxySubmission": null,
-    "behindProxy": "X-Forwarded-For",
-    "db": "./databases/sponsorTimes.db",
-    "privateDB": "./databases/private.db",
-    "createDatabaseIfNotExist": true,
-    "schemaFolder": "./databases",
-    "dbSchema": "./databases/_sponsorTimes.db.sql",
-    "privateDBSchema": "./databases/_private.db.sql",
-    "mode": "development",
-    "readOnly": false
 }
 EOF
-node index.js
+
+node dist/src/index.js

index.js

@@ -1,6 +0,0 @@
-var config = require('./src/config.js');
-var createServer = require('./src/app.js');
-const logger = require('./src/utils/logger.js');
-var server = createServer(() => {
-  logger.info("Server started on port " + config.port + ".");
-});

nodemon.json

@@ -0,0 +1,5 @@
+{
+    "watch": ["src"],
+    "ext": "ts,json",
+    "exec": "(npm test || echo test failed) && npm start"
+}