Bundle embedded web app

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.design/DESIGN.md

@@ -7,7 +7,7 @@ A collection of design contribution guidelines and resources for the Owncast int
 
 ## 👋 Welcome
 
-Owncast is a is a live streaming and chat server targeted to anybody who has live streaming needs. This means anybody from corporate events, government meetings, game streamers, musicians, churches, TV stations, and more.
+Owncast is a live streaming and chat server targeted to anybody who has live streaming needs. This means anybody from corporate events, government meetings, game streamers, musicians, churches, TV stations, and more.
 
 Read the detailed [product definition](https://github.com/owncast/owncast/blob/develop/docs/product-definition.md) to learn more.
 
@@ -25,7 +25,7 @@ Read the detailed [product definition](https://github.com/owncast/owncast/blob/d
 
 ## 🎭 Target audience
 
-Owncast is a is a live streaming and chat server targeted to anybody who has live streaming needs. This means anything from corporate events, government meetings, game streams, concerts, TV stations, and more.
+Owncast is a live streaming and chat server targeted to anybody who has live streaming needs. This means anything from corporate events, government meetings, game streams, concerts, TV stations, and more.
 
 ## 🧑‍🎨 Product design opportunities
 
@@ -57,7 +57,7 @@ https://owncast.online/components/?path=%2Fdocs%2Fowncast-styles-colors-componen
 ### Design Files, Screenshots, etc
 
 We do not currently have any design files that fully represent the state of
-the Owncast interface. However going forward it would be nice to resolve this
+the Owncast interface. However, going forward it would be nice to resolve this
 and collaborate on designs.
 
 We do have a [PenPot organization](https://design.penpot.app/#/dashboard/team/8373f780-f255-11ec-b774-f940e3befd53/projects). Please ask for access.

.earthlyignore

@@ -0,0 +1 @@
+test/automated/api/node_modules

.github/PULL_REQUEST_TEMPLATE/standard-pull-request.md

@@ -1,12 +1,17 @@
+# Read first
 
-Please include a summary of the change and which issue number is fixed, including relevant motivation and context. Feel free to mark this as a Draft or WIP and write up some details later.
+If this is an unsolicited change, or there is no existing issue filed for it, please open a GitHub issue before creating a pull request. This will allow us to discuss the motivations and the big picture behind the change first. It's possible there may be other solutions that should be discussed for what you think should be built. It is possible your change will be rejected unless some discussion around your proposal happens first. While creating this PR means you probably already did the work, it still makes sense to file an issue now, and into the future when you have proposed changes.
 
-If there is no issue filed for this particular change it's highly recommended you file one. While creating this PR means you probably already did the work, in the future make sure an issue is filed beforehand so changes, fixes and features can be discussed ahead of time.
+## Description
 
-# Description
+Please include a summary of the change and which issue number is fixed, including relevant motivation and context. Feel free to mark this as a Draft or WIP and write up some details later and start a conversation, even if your PR is not ready for review.
 
 Fixes # (issue)
 
+## Screenshot Examples or Logs
+
+If this is a frontend change, please include a screenshot of the change. If this is a backend change, please include relevant logs or examples of the change in action if applicable.
+
 ---
 
 Some things you might want to mention:
@@ -16,4 +21,4 @@ Some things you might want to mention:
 3. If you're fixing something, what was wrong? How should we stop from having this issue happen again?
 4. If this is a new feature or addition to functionality, why should it be added? What are the use cases? Who was asking for this functionality?
 
-If this is an unsolicited change or have no issue associated please do your best to detail the motivations behind this PR, and think about filing an issue to discuss changes ahead of time in the future.
+Thank you so much for contributing to Owncast! 🎉

.github/stale.yml

@@ -1,31 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - backlog
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. If this
-  was a feature request that others have shown no interest in then it's
-  likely to not get implemented due to lack of interest. If others also
-  want to see this feature then now is the time to say something!
-  Thank you for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
-exemptMilestones: true
-
-# Since old PRs are less useful than old issues ping them sooner.
-pulls:
-  daysUntilStale: 30
-  markComment: >
-    This pull request has not had any activity in 30 days. Since things move fast it's best 
-    to get PRs merged in. If this PR addresses a previously filed issue that needs to be
-    resolved please work to get it merged in, or allow somebody else to work on a fix.
-    This PR will be closed if no further activity occurs. Thank you for your contributions!
-  exemptLabels:
-      - bot

.github/workflows/actions-lint.yml

@@ -13,7 +13,15 @@ jobs:
     name: GitHub actions
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
       - uses: docker://rhysd/actionlint:latest
         with:

.github/workflows/auto-comment-on-label.yaml

@@ -11,7 +11,7 @@ jobs:
       issues: write
     steps:
       - name: Add comment
-        uses: peter-evans/create-or-update-comment@b2c2ea48c8372531b25379e516637a72161eedbe
+        uses: peter-evans/create-or-update-comment@fdb73c443d3a4f66832374f01fb9a713fad84937
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |

.github/workflows/automated-end-to-end-api.yaml

@@ -18,24 +18,44 @@ jobs:
         with:
           concurrent_skipping: 'same_content_newer'
 
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
+
+      - name: Get changed files
+        id: changed-files-yaml
+        uses: tj-actions/changed-files@v45
+        with:
+          files_yaml: |
+            src:
+              - '**/*.{go,mod,sum}'
+
       - uses: earthly/actions-setup@v1
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
         with:
           version: 'latest' # or pin to an specific version, e.g. "v0.6.10"
 
       - name: Earthly version
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
         run: earthly --version
 
       - name: Set up QEMU
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
         id: qemu
         uses: docker/setup-qemu-action@v3
         with:
           image: tonistiigi/binfmt:latest
           platforms: all
 
-      - uses: actions/checkout@v4
-
       - name: Run API tests
-        uses: nick-fields/retry@v2
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 3

.github/workflows/browser-testing.yml

@@ -19,15 +19,22 @@ jobs:
         with:
           concurrent_skipping: 'same_content_newer'
 
-      - name: Checkout
+      - name: Check out pull request code
         uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18.9.0
+          node-version: '22.9.0'
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules-browser-tests
         with:
@@ -38,16 +45,16 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache: true
 
       - name: Install Google Chrome
         run: sudo apt-get update && sudo apt-get install google-chrome-stable
 
       - name: Run Browser tests
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 20
           max_attempts: 3

.github/workflows/build-storybook.yml

@@ -3,7 +3,12 @@ on:
   push:
     branches:
       - develop
-    paths: ['web/stories/**', 'web/components/**', 'web/.storybook/**'] # Trigger the action only when files change in the folders defined here
+    paths: [
+        'web/stories/**',
+        'web/components/**',
+        'web/.storybook/**',
+        'web/i18n/**',
+      ] # Trigger the action only when files change in the folders defined here
 
 jobs:
   build-and-deploy:
@@ -11,11 +16,18 @@ jobs:
     if: github.repository == 'owncast/owncast'
 
     steps:
-      - name: Checkout
+      - name: Check out pull request code
         uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules-bundle-web-app
         with:
@@ -47,7 +59,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Dispatch event to web site
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.BUNDLE_STORYBOOK_OWNCAST_ONLINE }}
           repository: owncast/owncast.github.io

.github/workflows/chromatic.yml

@@ -27,23 +27,37 @@ jobs:
         uses: fkirc/skip-duplicate-actions@v5
         with:
           concurrent_skipping: 'same_content_newer'
-      - name: Check out code
-        if: ${{ github.actor != 'renovate[bot]' && github.actor != 'renovate' }}
+
+      - name: Check out pull request code
         uses: actions/checkout@v4
+        if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
         with:
-          # Make sure the actual branch is checked out when running on pull requests
-          ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
-          fetch-depth: 0
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
+
+      - name: Get changed files
+        id: changed-files-yaml
+        uses: tj-actions/changed-files@v45
+        with:
+          path: 'web'
+          files_ignore: |
+            static/**
+            web/next.config.js
+          files_yaml: |
+            src:
+              - '**/*.{js,ts,tsx,jsx,md}'
 
       - name: Install dependencies
-        if: ${{ github.actor != 'renovate[bot]' && github.actor != 'renovate' }}
+        if: ${{ github.actor != 'renovate[bot]' && github.actor != 'renovate' && steps.changed-files-yaml.outputs.src_any_changed == 'true'}}
         run: npm install
 
       - name: Publish to Chromatic
-        if: ${{ github.actor != 'renovate[bot]' && github.actor != 'renovate' }}
+        if: ${{ github.actor != 'renovate[bot]' && github.actor != 'renovate' && steps.changed-files-yaml.outputs.src_any_changed == 'true' }}
+        uses: chromaui/action@v11
 
-        uses: chromaui/action@v1
         # Chromatic GitHub Action options
         with:
           workingDir: web

.github/workflows/codeql-analysis.yml

@@ -9,16 +9,16 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
-    branches: [ develop ]
+    branches: [develop]
     paths-ignore:
       - 'static/**'
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ develop ]
+    branches: [develop]
     paths-ignore:
       - 'static/**'
 
@@ -30,41 +30,53 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'go', 'javascript' ]
+        language: ['go', 'javascript']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        config-file: ./.github/codeql/${{ matrix.language }}.yml
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+          cache: true
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          config-file: ./.github/codeql/${{ matrix.language }}.yml
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
+
+      #- run: |
+      #   make bootstrap
+      #   make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3

.github/workflows/container-lint.yml

@@ -19,7 +19,15 @@ jobs:
     container:
       image: aquasec/trivy
     steps:
-      - uses: actions/checkout@v4
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
       - name: Check critical issues
         run: trivy config --exit-code 1 --severity "HIGH,CRITICAL" ./Dockerfile

.github/workflows/container.yaml

@@ -37,10 +37,15 @@ jobs:
           image: tonistiigi/binfmt:latest
           platforms: all
 
-      - name: Checkout repo
+      - name: Check out pull request code
         uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
         with:
-          fetch-depth: 0
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push' || github.event_name == 'schedule'
 
       - name: Build and push
         if: ${{ github.event_name == 'schedule' && env.GH_CR_PAT != null }}
@@ -49,7 +54,7 @@ jobs:
           EARTHLY_BUILD_TAG: 'nightly'
           EARTHLY_BUILD_BRANCH: 'develop'
           EARTHLY_PUSH: true
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 20
           max_attempts: 3

.github/workflows/css-lint.yaml

@@ -0,0 +1,53 @@
+name: CSS Lint and Formatting
+
+on:
+  push:
+    paths:
+      - 'web/**'
+  pull_request:
+    paths:
+      - 'web/**'
+
+jobs:
+  css-lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web
+
+    steps:
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
+
+      - name: Get changed files
+        id: changed-files-yaml
+        uses: tj-actions/changed-files@v45
+        with:
+          path: 'web'
+          files_yaml: |
+            src:
+              - '**/*.{css,scss}'
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.9.0'
+
+      - name: Install dependencies
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        run: npm install
+
+      - name: Run Prettier
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        run: npx prettier --check ${{ steps.changed-files-yaml.outputs.src_all_changed_files }}
+
+      - name: Run Stylelint
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        run: npx stylelint ${{ steps.changed-files-yaml.outputs.src_all_changed_files }}

.github/workflows/generate-api-documentation.yaml

@@ -9,19 +9,26 @@ jobs:
     name: Generate API Documentation
     runs-on: ubuntu-latest
     steps:
-        - name: Checkout repo
-          uses: actions/checkout@v4
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-        - name: Run redoc on openapi.yaml
-          run: |
-            npx redoc-cli bundle openapi.yaml -o docs/api/index.html --options '{"hideHostname": true, "pathInMiddlePanel": true}'
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
-        - name: Commit changes
-          uses: EndBug/add-and-commit@v9
-          with:
-            author_name: Owncast
-            author_email: owncast@owncast.online
-            message: "Commit updated API documentation"
-            add: "docs/api/index.html"
-          env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Run redoc on openapi.yaml
+        run: |
+          npx @redocly/cli --config docs/api/redocly.yaml build-docs openapi.yaml -o docs/api/index.html
+
+      - name: Commit changes
+        uses: EndBug/add-and-commit@v9
+        with:
+          author_name: Owncast
+          author_email: owncast@owncast.online
+          message: 'Commit updated API documentation'
+          add: 'docs/api/index.html'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/go-lint.yml

@@ -26,13 +26,13 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache: true
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           only-new-issues: true
           args: --timeout=3m

.github/workflows/go-tests.yaml

@@ -12,13 +12,22 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.21.x, 1.22.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/cache@v3
+      - name: Get changed files
+        id: changed-files-yaml
+        uses: tj-actions/changed-files@v45
+        with:
+          files_yaml: |
+            src:
+              - '**/*.{go,mod,sum}'
+
+      - uses: actions/cache@v4
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
         with:
           path: |
             ~/.cache/go-build
@@ -28,12 +37,14 @@ jobs:
             go-test-
 
       - name: Install go
-        uses: actions/setup-go@v4
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        uses: actions/setup-go@v5
         with:
           go-version: '^1'
           cache: true
 
       - name: Run tests
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
         run: go test ./...
 
   test-bsds:
@@ -49,7 +60,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/cache@v3
+      - name: Get changed files
+        id: changed-files-yaml
+        uses: tj-actions/changed-files@v45
+        with:
+          files_yaml: |
+            src:
+              - '**/*.{go,mod,sum}'
+
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -59,10 +78,12 @@ jobs:
             go-test-
 
       - name: Install go
-        uses: actions/setup-go@v4
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        uses: actions/setup-go@v5
         with:
           go-version: '^1'
           cache: true
 
       - name: Run tests
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
         run: go test ./...

.github/workflows/hls-tests.yml

@@ -24,14 +24,33 @@ jobs:
         uses: fkirc/skip-duplicate-actions@v5
         with:
           concurrent_skipping: 'same_content_newer'
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
         with:
-          go-version: '1.21'
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
+
+      - name: Get changed files
+        id: changed-files-yaml
+        uses: tj-actions/changed-files@v45
+        with:
+          files_yaml: |
+            src:
+              - '**/*.{go,mod,sum}'
+
+      - uses: actions/setup-go@v5
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        with:
+          go-version: '1.22'
           cache: true
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules-hls-tests
         with:
@@ -43,14 +62,16 @@ jobs:
             ${{ runner.os }}-
 
       - name: Local stroage
-        uses: nick-fields/retry@v2
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 3
           command: cd test/automated/hls && ./run.sh
 
       - name: S3 storage
-        uses: nick-fields/retry@v2
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 3

.github/workflows/javascript-format-test-build.yml

@@ -28,18 +28,25 @@ jobs:
           cancel_others: 'true'
           skip_after_successful_duplicate: 'true'
 
-      - name: Checkout
+      - name: Check out pull request code
         uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
         with:
-          # Make sure the actual branch is checked out when running on pull requests
-          ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
-          fetch-depth: 0
-          persist-credentials: true
+          ref: ${{github.event.pull_request.head.ref}}
+
+      - name: Setup Nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.9.0'
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
       - name: Get changed files
         id: changed-files-yaml
-        uses: tj-actions/changed-files@v40
+        uses: tj-actions/changed-files@v45
         with:
           path: 'web'
           files_ignore: |
@@ -47,10 +54,10 @@ jobs:
             web/next.config.js
           files_yaml: |
             src:
-              - '**/*.{js,ts,tsx,jsx,css,md}'
+              - '**/*.{js,ts,tsx,jsx,md}'
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules-bundle-web-app
         with:
@@ -64,22 +71,34 @@ jobs:
       - name: Install Dependencies
         run: npm install
 
-      - name: Lint
-        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+      - name: Lint and fix
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true' && github.event_name != 'pull_request'
         run: npx eslint --fix ${{ steps.changed-files-yaml.outputs.src_all_changed_files }}
 
-      - name: Prettier
-        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+      - name: Lint
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true' && github.event_name == 'pull_request'
+        run: npx eslint ${{ steps.changed-files-yaml.outputs.src_all_changed_files }}
+
+      - name: Prettier formatting
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true' && github.event_name == 'pull_request'
         run: npx prettier --write ${{ steps.changed-files-yaml.outputs.src_all_changed_files }}
 
+      - name: Prettier check
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true' && github.event_name != 'pull_request'
+        run: npx prettier ${{ steps.changed-files-yaml.outputs.src_all_changed_files }}
+
+      - name: Debug changed files output
+        run: 'pwd && echo "Changed files: ${{ steps.changed-files-yaml.outputs.src_all_changed_files }}"'
+
       - name: Commit changes
-        if: steps.changed-files-yaml.outputs.src_any_changed == 'true'
+        if: steps.changed-files-yaml.outputs.src_any_changed == 'true' && github.event_name != 'pull_request'
         uses: EndBug/add-and-commit@v9
         with:
           author_name: Owncast
           author_email: owncast@owncast.online
           message: 'Javascript formatting autofixes'
           add: ${{ steps.changed-files-yaml.outputs.src_all_changed_files }}
+          cwd: './web' # Ensure this is the correct relative directory
           pull: '--rebase --autostash'
 
   unused-code:
@@ -97,16 +116,23 @@ jobs:
           cancel_others: 'true'
           skip_after_successful_duplicate: 'true'
 
-      - name: Checkout
+      - name: Check out pull request code
         uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
         with:
-          # Make sure the actual branch is checked out when running on pull requests
-          ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
-          fetch-depth: 0
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
+
+      - name: Setup Nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.9.0'
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules-bundle-web-app
         with:
@@ -123,6 +149,10 @@ jobs:
       - name: Check for unused JS code and dependencies
         run: npx knip --include dependencies,files,exports
 
+      - name: Run tests
+        working-directory: ./web
+        run: npm test
+
   # After any formatting and linting is complete we can run the build
   # and bundle step. This both will verify that the build is successful as
   # well as commiting the updated static files into the repository for use.
@@ -139,8 +169,13 @@ jobs:
           cancel_others: 'true'
           skip_after_successful_duplicate: 'true'
 
+      - name: Setup Nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.9.0'
+
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules-bundle-web-app
         with:
@@ -151,13 +186,15 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-      - name: Checkout
+      - name: Check out pull request code
         uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
         with:
-          # Make sure the actual branch is checked out when running on pull requests
-          ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
-          fetch-depth: 0
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
       - name: Bundle web app (next.js build)
         run: build/web/bundleWeb.sh

.github/workflows/javascript-tests.yml

@@ -1,45 +0,0 @@
-name: Javascript Tests
-
-on:
-  push:
-    paths:
-      - 'web/**'
-  pull_request:
-    paths:
-      - 'web/**'
-
-jobs:
-  jest-run:
-    runs-on: ubuntu-latest
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18.9.0
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules-javascript-tests
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('web/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Install Dependencies
-        working-directory: ./web
-        run: npm install
-
-      - name: Run tests
-        working-directory: ./web
-        run: npm test

.github/workflows/screenshots.yml

@@ -1,58 +0,0 @@
-name: Take nightly screenshots
-
-on:
-  schedule:
-    - cron: '0 4 * * *'
-
-env:
-  BROWSERSTACK_KEY: ${{ secrets.BROWSERSTACK_KEY }}
-  BROWSERSTACK_PASSWORD: ${{ secrets.BROWSERSTACK_PASSWORD }}
-  BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
-  TEST_URL: http://localhost:8080
-
-jobs:
-  Screenshots:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.21'
-          cache: true
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules-screenshots
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('test/automated/screenshots/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Automate screenshots
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 10
-          max_attempts: 4
-          command: cd test/automated/screenshots && ./run.sh
-
-      - name: Commit changes
-        uses: EndBug/add-and-commit@v9
-        with:
-          author_name: Owncast
-          author_email: owncast@owncast.online
-          message: 'Commit screenshots'
-          add: '*.png'
-          pull: '--rebase --autostash'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Dispatch event to web site
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.BUNDLE_STORYBOOK_OWNCAST_ONLINE }}
-          repository: owncast/owncast.github.io
-          event-type: bundle-components-library

.github/workflows/shellcheck.yml

@@ -18,9 +18,17 @@ jobs:
     env:
       LANG: C.UTF-8
     container:
-      image: docker.io/ubuntu:23.10
+      image: docker.io/ubuntu:24.04
     steps:
-      - uses: actions/checkout@v4
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        if: github.event_name == 'push'
 
       - name: Install shellcheck
         run: apt update && apt install -y shellcheck bash && shellcheck --version

.github/workflows/stale.yml

@@ -0,0 +1,49 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 */2 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          exempt-all-milestones: true
+
+          days-before-issue-stale: 60
+          days-before-issue-close: 67
+          exempt-issue-labels: backlog,long-lived,bot
+          exempt-all-issue-milestones: true
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. If this
+            was a feature request that others have shown no interest in, then it's
+            unlikely to get implemented due to lack of interest. If others also
+            want to see this feature then now is the time to say something! If this
+            is a bug report or you have questions that still need answering, please say
+            something. Feel free to drop by [our chat](https://owncast.rocket.chat) if
+            you'd like to discuss in real-time with people.
+          close-issue-message: >
+            This issue has been automatically closed due to inactivity. This isn't done
+            to be a jerk, or because the project doesn't care. But simply to keep the focus
+            on things that are actively discussed, and has continued interest from the community and
+            Owncast developers. Feel free to to comment if there is still discussion to be
+            had, or if you plan to work on it. Feel free to drop by [our chat](https://owncast.rocket.chat)
+            if you'd like to discuss in real-time with people. Thank you for being involved!
+
+          days-before-pr-stale: 30
+          days-before-pr-close: 37
+          exempt-pr-labels: backlog,long-lived,bot
+          exempt-all-pr-milestones: true
+          stale-pr-message: >
+            This pull request has not had any activity in 30 days. If it has been abandoned
+            no future actions are necessary, it will be automatically closed. If this is a PR
+            with no clear plan on how to move forward on it getting into the project, then
+            further discussion is needed. Now is a good time to discuss if this is still
+            something that should be worked on. If this PR is idle simply because nobody
+            has reviewed it, then feel free to ping somebody. However, if this PR is not linked to an
+            existing issue regarding something that was previously determined to be important, then even
+            more discussion needs to take place before it can get anywhere.
+            This PR will be closed if no further activity occurs. Thank you for your contributions!
+          close-pr-message: 'This PR was closed because it has been stalled for 10 days with no activity.'

.github/workflows/translations.yml

@@ -0,0 +1,62 @@
+name: Translation job
+
+on:
+  schedule:
+    # Run the workflow every hour
+    - cron: '0 * * * *'
+  push:
+    paths:
+      - 'web/i18n/en/translation.json'
+      - 'web/**/*.tsx'
+      - 'web/**/*.js'
+      - 'crowdin.yml'
+      - '.github/workflows/translations.yml'
+      - 'web/i18next-parser.config.mjs'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  generate-translations:
+    defaults:
+      run:
+        working-directory: ./web
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        if: ${{ github.actor != 'renovate[bot]' && github.actor != 'renovate' }}
+        run: npm install
+
+      - name: Generate translation files
+        run: npm run translate
+
+      - name: Crowdin upload sources/download translations
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: true
+          download_translations: true
+          create_pull_request: true
+          pull_request_title: 'New Translations'
+          localization_branch_name: translations
+          pull_request_base_branch_name: 'develop'
+          commit_message: 'Updated translations'
+          config: crowdin.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+
+      # - name: Commit changes
+      #   uses: EndBug/add-and-commit@v9
+      #   with:
+      #     author_name: Owncast
+      #     author_email: owncast@owncast.online
+      #     message: 'Commit updated translations'
+      #     add: 'web/i18n/**'
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -4,6 +4,7 @@
 *.dll
 *.so
 *.dylib
+.DS_Store
 
 # Test binary, built with `go test -c`
 *.test

.golangci.yml

@@ -5,7 +5,7 @@ run:
   # Define the Go version limit.
   # Mainly related to generics support in go1.18.
   # Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.18
-  go: '1.21'
+  go: '1.22'
 
 issues:
   # The linter has a default list of ignorable errors. Turning this on will enable that list.
@@ -28,7 +28,6 @@ linters:
     - bodyclose
     - dupl
     - errcheck
-    - exportloopref
     - goconst
     - godot
     - godox
@@ -49,7 +48,7 @@ linters:
     - cyclop
     - gosimple
     - unused
-    - exportloopref
+    - copyloopvar
     - gocritic
     - forbidigo
     - unparam
@@ -67,12 +66,6 @@ linters-settings:
     # should ignore tests
     skip-tests: true
 
-  gosimple:
-    # Select the Go version to target. The default is '1.13'.
-    go: '1.21'
-    # https://staticcheck.io/docs/options#checks
-    checks: ['all']
-
   gocritic:
     disabled-checks:
       - ifElseChain

Dockerfile

@@ -22,7 +22,7 @@ ENV NAME=${NAME}
 RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -ldflags "-extldflags \"-static\" -s -w -X github.com/owncast/owncast/config.GitCommit=$GIT_COMMIT -X github.com/owncast/owncast/config.VersionNumber=$VERSION -X github.com/owncast/owncast/config.BuildPlatform=$NAME" -o owncast .
 
 # Create the image by copying the result of the build into a new alpine image
-FROM alpine:3.18.4
+FROM alpine:3.21.2
 RUN apk update && apk add --no-cache ffmpeg ffmpeg-libs ca-certificates && update-ca-certificates
 
 RUN addgroup -g 101 -S owncast && adduser -u 101 -S owncast -G owncast

Earthfile

@@ -1,6 +1,6 @@
 VERSION --new-platform 0.6
 
-FROM --platform=linux/amd64 alpine:3.15.5
+FROM --platform=linux/amd64 alpine:3.21.2
 ARG version=develop
 
 WORKDIR /build
@@ -87,7 +87,7 @@ build:
 	  RUN upx -t owncast
   END
 
-  SAVE ARTIFACT owncast owncast
+  SAVE ARTIFACT --keep-ts owncast owncast
 
 package:
   RUN apk add --update --no-cache zip >> /dev/null
@@ -109,7 +109,7 @@ package:
     ARG NAME=custom
   END
 
-  COPY (+build/owncast --platform $TARGETPLATFORM) /build/dist/owncast
+  COPY --keep-ts (+build/owncast --platform $TARGETPLATFORM) /build/dist/owncast
   ENV ZIPNAME owncast-$version-$NAME.zip
   RUN cd /build/dist && zip -r -q -8 /build/dist/owncast.zip .
   SAVE ARTIFACT --keep-ts /build/dist/owncast.zip owncast.zip AS LOCAL dist/$ZIPNAME
@@ -119,11 +119,11 @@ docker:
 	# in as space separated strings using the full account/repo:tag format.
 	# https://github.com/earthly/earthly/blob/aea38448fa9c0064b1b70d61be717ae740689fb9/docs/earthfile/earthfile.md#assigning-multiple-image-names
   ARG TARGETPLATFORM
-  FROM --platform=$TARGETPLATFORM alpine:3.15.5
+  FROM --platform=$TARGETPLATFORM alpine:3.21.2
   RUN apk update && apk add --no-cache ffmpeg ffmpeg-libs ca-certificates unzip && update-ca-certificates
   RUN addgroup -g 101 -S owncast && adduser -u 101 -S owncast -G owncast
   WORKDIR /app
-  COPY --platform=$TARGETPLATFORM +package/owncast.zip /app
+  COPY --keep-ts --platform=$TARGETPLATFORM +package/owncast.zip /app
   RUN unzip -x owncast.zip && mkdir data
 
 	# temporarily disable until we figure out how to move forward

README.md

@@ -1,37 +1,48 @@
-<br />
 <p align="center">
   <a href="https://github.com/owncast/owncast" alt="Owncast">
-    <img src="https://owncast.online/images/logo.png" alt="Logo" width="200">
+    <img src="https://owncast.online/images/logo.png" alt="Owncast Logo" width="200">
+  </a>
+</p>
+
+<p align="center">
+	<strong>Take control over your content and stream it yourself.</strong>
+</p>
+
+<br/>
+
+<p align="center">
+	<a href="https://github.com/owncast/owncast/blob/develop/LICENSE">
+    <img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License" />
   </a>
 </p>
 
 <br/>
 
-  <p align="center">
-    <strong>Take control over your content and stream it yourself.</strong>
-    <br />
-    <a href="https://owncast.online"><strong>Explore the docs »</strong></a>
-    <br />
-    <a href="https://watch.owncast.online/">View Demo</a>
-    ·
-    <a href="https://broadcast.owncast.online/">Use Our Server for Testing</a>
-    ·
-    <a href="https://owncast.online/faq/">FAQ</a>
-    ·
-    <a href="https://github.com/owncast/owncast/issues">Report Bug</a>
-  </p>
+<p align="center">
+	<a href="https://owncast.online"><strong>Explore the docs »</strong></a>
+	<br />
+	<a href="https://watch.owncast.online/">View Demo</a>
+	·
+	<a href="https://owncast.online/faq/">FAQ</a>
+	·
+	<a href="https://github.com/owncast/owncast/issues">Report Bug</a>
 </p>
 
+
 <!-- TABLE OF CONTENTS -->
 
 ## Table of Contents
 
-- [About the Project](#about-the-project)
-- [Getting Started](#getting-started)
-- [Use with your broadcasting software](#use-with-your-existing-broadcasting-software)
-- [Building from source](#building-from-source)
-- [Contributing](#contributing)
-- [License](#license)
+- 📒 [About the Project](#about-the-project)
+- 🚀 [Getting Started](#getting-started)
+- 👨‍💻 [Use with your broadcasting software](#use-with-your-existing-broadcasting-software)
+- 🛠 [Building from source](#building-from-source)
+  - 🚨 [Important note about source code and the develop branch](#important-note-about-source-code-and-the-develop-branch)
+  - 🗄️ [Backend](#backend)
+  - ⚛️ [Frontend](#frontend)
+- 👏 [Contributing](#contributing)
+  - 💵 [Donors](#donors)
+- 📝 [License](#license)
 - [Contact](#contact)
 
 <!-- ABOUT THE PROJECT -->
@@ -95,7 +106,7 @@ The Owncast backend is a service written in Go.
 1. Ensure you have prerequisites installed.
    - C compiler, such as [GCC compiler](https://gcc.gnu.org/install/download.html) or a [Musl-compatible compiler](https://musl.libc.org/)
    - [ffmpeg](https://ffmpeg.org/download.html)
-1. Install the [Go toolchain](https://golang.org/dl/) (1.21 or above).
+1. Install the [Go toolchain](https://golang.org/dl/) (1.22 or above).
 1. Clone the repo. `git clone https://github.com/owncast/owncast`
 1. `go run main.go` will run from the source.
 1. Visit `http://yourserver:8080` to access the web interface or `http://yourserver:8080/admin` to access the admin.
@@ -117,18 +128,50 @@ And while we have a small team of kind, talented and thoughtful volunteers, we h
 We abide by our [Code of Conduct](https://owncast.online/contribute/) and feel strongly about open, appreciative, and empathetic people joining us.
 We’ve been very lucky to have this so far, so maybe you can help us with your skills and passion, too!
 
+If you're new to the project, maybe you'd be interested in looking at [![Good First Issue](https://img.shields.io/github/issues/owncast/owncast/good%20first%20issue.svg)](https://github.com/owncast/owncast/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
+
 There is a larger, more detailed, and more up-to-date [guide for helping contribute to Owncast on our website](https://owncast.online/help/).
 
+### Donors
+The Owncast project is possible thanks to the people who make a donation to support us and our work.
+Thank you to all our donors who help keep Owncast running by donating on OpenCollective. You can support this project by [becoming a backer/sponsor](https://opencollective.com/owncast#suppor).
+
+<div>
+	<a href="https://opencollective.com/owncast#support">
+		<img alt="GitHub issues by-label" src="https://opencollective.com/owncast/tiers/backers.svg?avatarHeight=36&width=600" alt="Backer button">
+	</a>
+</div>
+	
 <!-- LICENSE -->
 
 ## License
 
 Distributed under the MIT License. See `LICENSE` for more information.
 
-## Supported by
-
-- This project is tested with [BrowserStack](https://browserstack.com).
+## Support
 
+<ul style="font-size:21px; color:black; ">
+<li>Browser testing via <a
+href="https://www.lambdatest.com/" target="_blank"><img
+src="https://www.lambdatest.com/support/img/logo.svg"
+style="vertical-align: middle;margin-left:5px" width="147" height="26"
+/></a></li>
+<li>Project chat provided by
+<a href="https://rocket.chat" target="_blank">
+<img src="https://owncast.online/images/sponsors/rocketchat.png" width="147" height="26" style="vertical-align: middle;margin-left:5px">
+</a>
+</li>
+<li>CDN services by
+<a href="https://fastly.com" target="_blank">
+<img src="https://owncast.online/images/sponsors/fastly.png" height="26" style="vertical-align: middle;margin-left:5px">
+</a>
+</li>
+<li>UI testing with Chromatic
+<a href="https://chromatic.com" target="_blank">
+<img src="https://owncast.online/images/sponsors/chromatic.png" height="26" style="vertical-align: middle;margin-left:5px">
+</a>
+</li>
+</ul>
 <!-- CONTACT -->
 
 ## Contact

activitypub/activitypub.go

@@ -1,11 +1,14 @@
 package activitypub
 
 import (
+	"math"
+
 	"github.com/owncast/owncast/activitypub/crypto"
 	"github.com/owncast/owncast/activitypub/inbox"
 	"github.com/owncast/owncast/activitypub/outbox"
 	"github.com/owncast/owncast/activitypub/persistence"
 	"github.com/owncast/owncast/activitypub/workerpool"
+	"github.com/owncast/owncast/persistence/configrepository"
 
 	"github.com/owncast/owncast/core/data"
 	"github.com/owncast/owncast/models"
@@ -14,22 +17,35 @@ import (
 
 // Start will initialize and start the federation support.
 func Start(datastore *data.Datastore) {
+	configRepository := configrepository.Get()
 	persistence.Setup(datastore)
-	workerpool.InitOutboundWorkerPool()
+
+	outboundWorkerPoolSize := getOutboundWorkerPoolSize()
+	workerpool.InitOutboundWorkerPool(outboundWorkerPoolSize)
 	inbox.InitInboxWorkerPool()
-	StartRouter()
 
 	// Generate the keys for signing federated activity if needed.
-	if data.GetPrivateKey() == "" {
+	if configRepository.GetPrivateKey() == "" {
 		privateKey, publicKey, err := crypto.GenerateKeys()
-		_ = data.SetPrivateKey(string(privateKey))
-		_ = data.SetPublicKey(string(publicKey))
+		_ = configRepository.SetPrivateKey(string(privateKey))
+		_ = configRepository.SetPublicKey(string(publicKey))
 		if err != nil {
 			log.Errorln("Unable to get private key", err)
 		}
 	}
 }
 
+func getOutboundWorkerPoolSize() int {
+	var followerCount int64
+	fc, err := persistence.GetFollowerCount()
+	if err != nil {
+		log.Errorln("Unable to get follower count", err)
+		fc = 50 // Arbitrary fallback value.
+	}
+	followerCount = int64(math.Max(float64(fc), 50))
+	return int(followerCount * 5)
+}
+
 // SendLive will send a "Go Live" message to followers.
 func SendLive() error {
 	return outbox.SendLive()

activitypub/apmodels/activity.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-fed/activity/streams"
 	"github.com/go-fed/activity/streams/vocab"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 )
 
 // PrivacyAudience represents the audience for an activity.
@@ -87,8 +87,10 @@ func MakeActivityDirect(activity vocab.ActivityStreamsCreate, toIRI *url.URL) vo
 // MakeActivityPublic sets the required properties to make this activity
 // seen as public.
 func MakeActivityPublic(activity vocab.ActivityStreamsCreate) vocab.ActivityStreamsCreate {
+	configRepository := configrepository.Get()
+
 	// TO the public if we're not treating ActivityPub as "private".
-	if !data.GetFederationIsPrivate() {
+	if !configRepository.GetFederationIsPrivate() {
 		public, _ := url.Parse(PUBLIC)
 
 		to := streams.NewActivityStreamsToProperty()
@@ -121,7 +123,9 @@ func MakeUpdateActivity(activityID *url.URL) vocab.ActivityStreamsUpdate {
 	activity.SetJSONLDId(id)
 
 	// CC the public if we're not treating ActivityPub as "private".
-	if !data.GetFederationIsPrivate() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationIsPrivate() {
 		public, _ := url.Parse(PUBLIC)
 		cc := streams.NewActivityStreamsCcProperty()
 		cc.AppendIRI(public)

activitypub/apmodels/actor.go

@@ -9,8 +9,8 @@ import (
 	"github.com/go-fed/activity/streams"
 	"github.com/go-fed/activity/streams/vocab"
 	"github.com/owncast/owncast/activitypub/crypto"
-	"github.com/owncast/owncast/core/data"
 	"github.com/owncast/owncast/models"
+	"github.com/owncast/owncast/persistence/configrepository"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -101,11 +101,13 @@ func MakeActorPropertyWithID(idIRI *url.URL) vocab.ActivityStreamsActorProperty
 
 // MakeServiceForAccount will create a new local actor service with the the provided username.
 func MakeServiceForAccount(accountName string) vocab.ActivityStreamsService {
+	configRepository := configrepository.Get()
+
 	actorIRI := MakeLocalIRIForAccount(accountName)
 
 	person := streams.NewActivityStreamsService()
 	nameProperty := streams.NewActivityStreamsNameProperty()
-	nameProperty.AppendXMLSchemaString(data.GetServerName())
+	nameProperty.AppendXMLSchemaString(configRepository.GetServerName())
 	person.SetActivityStreamsName(nameProperty)
 
 	preferredUsernameProperty := streams.NewActivityStreamsPreferredUsernameProperty()
@@ -119,7 +121,7 @@ func MakeServiceForAccount(accountName string) vocab.ActivityStreamsService {
 	person.SetActivityStreamsInbox(inboxProp)
 
 	needsFollowApprovalProperty := streams.NewActivityStreamsManuallyApprovesFollowersProperty()
-	needsFollowApprovalProperty.Set(data.GetFederationIsPrivate())
+	needsFollowApprovalProperty.Set(configRepository.GetFederationIsPrivate())
 	person.SetActivityStreamsManuallyApprovesFollowers(needsFollowApprovalProperty)
 
 	outboxIRI := MakeLocalIRIForResource("/user/" + accountName + "/outbox")
@@ -152,7 +154,7 @@ func MakeServiceForAccount(accountName string) vocab.ActivityStreamsService {
 	publicKeyProp.AppendW3IDSecurityV1PublicKey(publicKeyType)
 	person.SetW3IDSecurityV1PublicKey(publicKeyProp)
 
-	if t, err := data.GetServerInitTime(); t != nil {
+	if t, err := configRepository.GetServerInitTime(); t != nil {
 		publishedDateProp := streams.NewActivityStreamsPublishedProperty()
 		publishedDateProp.Set(t.Time)
 		person.SetActivityStreamsPublished(publishedDateProp)
@@ -163,8 +165,8 @@ func MakeServiceForAccount(accountName string) vocab.ActivityStreamsService {
 	// Profile properties
 
 	// Avatar
-	uniquenessString := data.GetLogoUniquenessString()
-	userAvatarURLString := data.GetServerURL() + "/logo/external"
+	uniquenessString := configRepository.GetLogoUniquenessString()
+	userAvatarURLString := configRepository.GetServerURL() + "/logo/external"
 	userAvatarURL, err := url.Parse(userAvatarURLString)
 	userAvatarURL.RawQuery = "uc=" + uniquenessString
 	if err != nil {
@@ -195,14 +197,14 @@ func MakeServiceForAccount(accountName string) vocab.ActivityStreamsService {
 
 	// Profile bio
 	summaryProperty := streams.NewActivityStreamsSummaryProperty()
-	summaryProperty.AppendXMLSchemaString(data.GetServerSummary())
+	summaryProperty.AppendXMLSchemaString(configRepository.GetServerSummary())
 	person.SetActivityStreamsSummary(summaryProperty)
 
 	// Links
-	if serverURL := data.GetServerURL(); serverURL != "" {
+	if serverURL := configRepository.GetServerURL(); serverURL != "" {
 		addMetadataLinkToProfile(person, "Stream", serverURL)
 	}
-	for _, link := range data.GetSocialHandles() {
+	for _, link := range configRepository.GetSocialHandles() {
 		addMetadataLinkToProfile(person, link.Platform, link.URL)
 	}
 
@@ -220,7 +222,7 @@ func MakeServiceForAccount(accountName string) vocab.ActivityStreamsService {
 
 	// Tags
 	tagProp := streams.NewActivityStreamsTagProperty()
-	for _, tagString := range data.GetServerMetadataTags() {
+	for _, tagString := range configRepository.GetServerMetadataTags() {
 		hashtag := MakeHashtag(tagString)
 		tagProp.AppendTootHashtag(hashtag)
 	}
@@ -229,7 +231,7 @@ func MakeServiceForAccount(accountName string) vocab.ActivityStreamsService {
 
 	// Work around an issue where a single attachment will not serialize
 	// as an array, so add another item to the mix.
-	if len(data.GetSocialHandles()) == 1 {
+	if len(configRepository.GetSocialHandles()) == 1 {
 		addMetadataLinkToProfile(person, "Owncast", "https://owncast.online")
 	}
 

activitypub/apmodels/actor_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/go-fed/activity/streams"
 	"github.com/go-fed/activity/streams/vocab"
 	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 )
 
 func makeFakeService() vocab.ActivityStreamsService {
@@ -55,9 +56,11 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		panic(err)
 	}
-
 	data.SetupPersistence(dbFile.Name())
-	data.SetServerURL("https://my.cool.site.biz")
+
+	configRepository := configrepository.Get()
+
+	configRepository.SetServerURL("https://my.cool.site.biz")
 
 	m.Run()
 }

activitypub/apmodels/utils.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-fed/activity/streams"
 	"github.com/go-fed/activity/streams/vocab"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -27,7 +27,9 @@ func MakeRemoteIRIForResource(resourcePath string, host string) (*url.URL, error
 
 // MakeLocalIRIForResource will create an IRI for the local server.
 func MakeLocalIRIForResource(resourcePath string) *url.URL {
-	host := data.GetServerURL()
+	configRepository := configrepository.Get()
+
+	host := configRepository.GetServerURL()
 	u, err := url.Parse(host)
 	if err != nil {
 		log.Errorln("unable to parse local IRI url", host, err)
@@ -41,7 +43,9 @@ func MakeLocalIRIForResource(resourcePath string) *url.URL {
 
 // MakeLocalIRIForAccount will return a full IRI for the local server account username.
 func MakeLocalIRIForAccount(account string) *url.URL {
-	host := data.GetServerURL()
+	configRepository := configrepository.Get()
+
+	host := configRepository.GetServerURL()
 	u, err := url.Parse(host)
 	if err != nil {
 		log.Errorln("unable to parse local IRI account server url", err)
@@ -64,7 +68,9 @@ func Serialize(obj vocab.Type) ([]byte, error) {
 
 // MakeLocalIRIForStreamURL will return a full IRI for the local server stream url.
 func MakeLocalIRIForStreamURL() *url.URL {
-	host := data.GetServerURL()
+	configRepository := configrepository.Get()
+
+	host := configRepository.GetServerURL()
 	u, err := url.Parse(host)
 	if err != nil {
 		log.Errorln("unable to parse local IRI stream url", err)
@@ -78,7 +84,9 @@ func MakeLocalIRIForStreamURL() *url.URL {
 
 // MakeLocalIRIforLogo will return a full IRI for the local server logo.
 func MakeLocalIRIforLogo() *url.URL {
-	host := data.GetServerURL()
+	configRepository := configrepository.Get()
+
+	host := configRepository.GetServerURL()
 	u, err := url.Parse(host)
 	if err != nil {
 		log.Errorln("unable to parse local IRI stream url", err)
@@ -93,7 +101,9 @@ func MakeLocalIRIforLogo() *url.URL {
 // GetLogoType will return the rel value for the webfinger response and
 // the default static image is of type png.
 func GetLogoType() string {
-	imageFilename := data.GetLogoPath()
+	configRepository := configrepository.Get()
+
+	imageFilename := configRepository.GetLogoPath()
 	if imageFilename == "" {
 		return "image/png"
 	}

activitypub/controllers/actors.go

@@ -9,12 +9,14 @@ import (
 	"github.com/owncast/owncast/activitypub/apmodels"
 	"github.com/owncast/owncast/activitypub/crypto"
 	"github.com/owncast/owncast/activitypub/requests"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 )
 
 // ActorHandler handles requests for a single actor.
 func ActorHandler(w http.ResponseWriter, r *http.Request) {
-	if !data.GetFederationEnabled() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
@@ -22,7 +24,7 @@ func ActorHandler(w http.ResponseWriter, r *http.Request) {
 	pathComponents := strings.Split(r.URL.Path, "/")
 	accountName := pathComponents[3]
 
-	if _, valid := data.GetFederatedInboxMap()[accountName]; !valid {
+	if _, valid := configRepository.GetFederatedInboxMap()[accountName]; !valid {
 		// User is not valid
 		w.WriteHeader(http.StatusNotFound)
 		return

activitypub/controllers/followers.go

@@ -16,7 +16,7 @@ import (
 	"github.com/owncast/owncast/activitypub/crypto"
 	"github.com/owncast/owncast/activitypub/persistence"
 	"github.com/owncast/owncast/activitypub/requests"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 )
 
 const (
@@ -145,7 +145,9 @@ func getFollowersPage(page string, r *http.Request) (vocab.ActivityStreamsOrdere
 }
 
 func createPageURL(r *http.Request, page *string) (*url.URL, error) {
-	domain := data.GetServerURL()
+	configRepository := configrepository.Get()
+
+	domain := configRepository.GetServerURL()
 	if domain == "" {
 		return nil, errors.New("unable to get server URL")
 	}

activitypub/controllers/inbox.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/owncast/owncast/activitypub/apmodels"
 	"github.com/owncast/owncast/activitypub/inbox"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -22,7 +22,9 @@ func InboxHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func acceptInboxRequest(w http.ResponseWriter, r *http.Request) {
-	if !data.GetFederationEnabled() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
@@ -39,7 +41,7 @@ func acceptInboxRequest(w http.ResponseWriter, r *http.Request) {
 
 	// The account this request is for must match the account name we have set
 	// for federation.
-	if forLocalAccount != data.GetFederationUsername() {
+	if forLocalAccount != configRepository.GetFederationUsername() {
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}

activitypub/controllers/nodeinfo.go

@@ -10,7 +10,7 @@ import (
 	"github.com/owncast/owncast/activitypub/persistence"
 	"github.com/owncast/owncast/activitypub/requests"
 	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -25,12 +25,14 @@ func NodeInfoController(w http.ResponseWriter, r *http.Request) {
 		Links []links `json:"links"`
 	}
 
-	if !data.GetFederationEnabled() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
 
-	serverURL := data.GetServerURL()
+	serverURL := configRepository.GetServerURL()
 	if serverURL == "" {
 		w.WriteHeader(http.StatusNotFound)
 		return
@@ -89,7 +91,9 @@ func NodeInfoV2Controller(w http.ResponseWriter, r *http.Request) {
 		Metadata          metadata `json:"metadata"`
 	}
 
-	if !data.GetFederationEnabled() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
@@ -117,7 +121,7 @@ func NodeInfoV2Controller(w http.ResponseWriter, r *http.Request) {
 		OpenRegistrations: false,
 		Protocols:         []string{"activitypub"},
 		Metadata: metadata{
-			ChatEnabled: !data.GetChatDisabled(),
+			ChatEnabled: !configRepository.GetChatDisabled(),
 		},
 	}
 
@@ -163,12 +167,14 @@ func XNodeInfo2Controller(w http.ResponseWriter, r *http.Request) {
 		OpenRegistrations bool         `json:"openRegistrations"`
 	}
 
-	if !data.GetFederationEnabled() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
 
-	serverURL := data.GetServerURL()
+	serverURL := configRepository.GetServerURL()
 	if serverURL == "" {
 		w.WriteHeader(http.StatusNotFound)
 		return
@@ -178,7 +184,7 @@ func XNodeInfo2Controller(w http.ResponseWriter, r *http.Request) {
 
 	res := &response{
 		Organization: Organization{
-			Name:    data.GetServerName(),
+			Name:    configRepository.GetServerName(),
 			Contact: serverURL,
 		},
 		Server: Server{
@@ -232,12 +238,14 @@ func InstanceV1Controller(w http.ResponseWriter, r *http.Request) {
 		InvitesEnabled   bool     `json:"invites_enabled"`
 	}
 
-	if !data.GetFederationEnabled() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
 
-	serverURL := data.GetServerURL()
+	serverURL := configRepository.GetServerURL()
 	if serverURL == "" {
 		w.WriteHeader(http.StatusNotFound)
 		return
@@ -254,9 +262,9 @@ func InstanceV1Controller(w http.ResponseWriter, r *http.Request) {
 
 	res := response{
 		URI:              serverURL,
-		Title:            data.GetServerName(),
-		ShortDescription: data.GetServerSummary(),
-		Description:      data.GetServerSummary(),
+		Title:            configRepository.GetServerName(),
+		ShortDescription: configRepository.GetServerSummary(),
+		Description:      configRepository.GetServerSummary(),
 		Version:          config.GetReleaseString(),
 		Stats: Stats{
 			UserCount:   1,
@@ -275,7 +283,9 @@ func InstanceV1Controller(w http.ResponseWriter, r *http.Request) {
 }
 
 func writeResponse(payload interface{}, w http.ResponseWriter) error {
-	accountName := data.GetDefaultFederationUsername()
+	configRepository := configrepository.Get()
+
+	accountName := configRepository.GetDefaultFederationUsername()
 	actorIRI := apmodels.MakeLocalIRIForAccount(accountName)
 	publicKey := crypto.GetPublicKey(actorIRI)
 
@@ -284,7 +294,15 @@ func writeResponse(payload interface{}, w http.ResponseWriter) error {
 
 // HostMetaController points to webfinger.
 func HostMetaController(w http.ResponseWriter, r *http.Request) {
-	serverURL := data.GetServerURL()
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
+		w.WriteHeader(http.StatusMethodNotAllowed)
+		log.Debugln("host meta request rejected! Federation is not enabled")
+		return
+	}
+
+	serverURL := configRepository.GetServerURL()
 	if serverURL == "" {
 		w.WriteHeader(http.StatusNotFound)
 		return

activitypub/controllers/object.go

@@ -8,31 +8,33 @@ import (
 	"github.com/owncast/owncast/activitypub/crypto"
 	"github.com/owncast/owncast/activitypub/persistence"
 	"github.com/owncast/owncast/activitypub/requests"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	log "github.com/sirupsen/logrus"
 )
 
 // ObjectHandler handles requests for a single federated ActivityPub object.
 func ObjectHandler(w http.ResponseWriter, r *http.Request) {
-	if !data.GetFederationEnabled() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
 
 	// If private federation mode is enabled do not allow access to objects.
-	if data.GetFederationIsPrivate() {
+	if configRepository.GetFederationIsPrivate() {
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
 
-	iri := strings.Join([]string{strings.TrimSuffix(data.GetServerURL(), "/"), r.URL.Path}, "")
+	iri := strings.Join([]string{strings.TrimSuffix(configRepository.GetServerURL(), "/"), r.URL.Path}, "")
 	object, _, _, err := persistence.GetObjectByIRI(iri)
 	if err != nil {
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
 
-	accountName := data.GetDefaultFederationUsername()
+	accountName := configRepository.GetDefaultFederationUsername()
 	actorIRI := apmodels.MakeLocalIRIForAccount(accountName)
 	publicKey := crypto.GetPublicKey(actorIRI)
 

activitypub/controllers/webfinger.go

@@ -6,20 +6,22 @@ import (
 	"strings"
 
 	"github.com/owncast/owncast/activitypub/apmodels"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	"github.com/owncast/owncast/utils"
 	log "github.com/sirupsen/logrus"
 )
 
 // WebfingerHandler will handle webfinger lookup requests.
 func WebfingerHandler(w http.ResponseWriter, r *http.Request) {
-	if !data.GetFederationEnabled() {
+	configRepository := configrepository.Get()
+
+	if !configRepository.GetFederationEnabled() {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		log.Debugln("webfinger request rejected! Federation is not enabled")
 		return
 	}
 
-	instanceHostURL := data.GetServerURL()
+	instanceHostURL := configRepository.GetServerURL()
 	if instanceHostURL == "" {
 		w.WriteHeader(http.StatusNotFound)
 		log.Warnln("webfinger request rejected! Federation is enabled but server URL is empty.")
@@ -29,7 +31,7 @@ func WebfingerHandler(w http.ResponseWriter, r *http.Request) {
 	instanceHostString := utils.GetHostnameFromURLString(instanceHostURL)
 	if instanceHostString == "" {
 		w.WriteHeader(http.StatusNotFound)
-		log.Warnln("webfinger request rejected! Federation is enabled but server URL is not set properly. data.GetServerURL(): " + data.GetServerURL())
+		log.Warnln("webfinger request rejected! Federation is enabled but server URL is not set properly. data.GetServerURL(): " + configRepository.GetServerURL())
 		return
 	}
 
@@ -51,7 +53,7 @@ func WebfingerHandler(w http.ResponseWriter, r *http.Request) {
 	host := userComponents[1]
 	user := userComponents[0]
 
-	if _, valid := data.GetFederatedInboxMap()[user]; !valid {
+	if _, valid := configRepository.GetFederatedInboxMap()[user]; !valid {
 		w.WriteHeader(http.StatusNotFound)
 		log.Debugln("webfinger request rejected! Invalid user: " + user)
 		return

activitypub/crypto/keys.go

@@ -8,13 +8,15 @@ import (
 	"errors"
 	"net/url"
 
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	log "github.com/sirupsen/logrus"
 )
 
 // GetPublicKey will return the public key for the provided actor.
 func GetPublicKey(actorIRI *url.URL) PublicKey {
-	key := data.GetPublicKey()
+	configRepository := configrepository.Get()
+
+	key := configRepository.GetPublicKey()
 	idURL, err := url.Parse(actorIRI.String() + "#main-key")
 	if err != nil {
 		log.Errorln("unable to parse actor iri string", idURL, err)
@@ -29,7 +31,9 @@ func GetPublicKey(actorIRI *url.URL) PublicKey {
 
 // GetPrivateKey will return the internal server private key.
 func GetPrivateKey() *rsa.PrivateKey {
-	key := data.GetPrivateKey()
+	configRepository := configrepository.Get()
+
+	key := configRepository.GetPrivateKey()
 
 	block, _ := pem.Decode([]byte(key))
 	if block == nil {

activitypub/inbox/chat.go

@@ -7,17 +7,19 @@ import (
 	"github.com/owncast/owncast/activitypub/resolvers"
 	"github.com/owncast/owncast/core/chat"
 	"github.com/owncast/owncast/core/chat/events"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 )
 
 func handleEngagementActivity(eventType events.EventType, isLiveNotification bool, actorReference vocab.ActivityStreamsActorProperty, action string) error {
+	configRepository := configrepository.Get()
+
 	// Do nothing if displaying engagement actions has been turned off.
-	if !data.GetFederationShowEngagement() {
+	if !configRepository.GetFederationShowEngagement() {
 		return nil
 	}
 
 	// Do nothing if chat is disabled
-	if data.GetChatDisabled() {
+	if configRepository.GetChatDisabled() {
 		return nil
 	}
 
@@ -36,11 +38,11 @@ func handleEngagementActivity(eventType events.EventType, isLiveNotification boo
 	if isLiveNotification && action == events.FediverseEngagementLike {
 		suffix = "liked that this stream went live."
 	} else if action == events.FediverseEngagementLike {
-		suffix = fmt.Sprintf("liked a post from %s.", data.GetServerName())
+		suffix = fmt.Sprintf("liked a post from %s.", configRepository.GetServerName())
 	} else if isLiveNotification && action == events.FediverseEngagementRepost {
 		suffix = "shared this stream with their followers."
 	} else if action == events.FediverseEngagementRepost {
-		suffix = fmt.Sprintf("shared a post from %s.", data.GetServerName())
+		suffix = fmt.Sprintf("shared a post from %s.", configRepository.GetServerName())
 	} else if action == events.FediverseEngagementFollow {
 		suffix = "followed this stream."
 	} else {

activitypub/inbox/follow.go

@@ -10,13 +10,15 @@ import (
 	"github.com/owncast/owncast/activitypub/requests"
 	"github.com/owncast/owncast/activitypub/resolvers"
 	"github.com/owncast/owncast/core/chat/events"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	"github.com/pkg/errors"
 
 	log "github.com/sirupsen/logrus"
 )
 
 func handleFollowInboxRequest(c context.Context, activity vocab.ActivityStreamsFollow) error {
+	configRepository := configrepository.Get()
+
 	follow, err := resolvers.MakeFollowRequest(c, activity)
 	if err != nil {
 		log.Errorln("unable to create follow inbox request", err)
@@ -27,7 +29,7 @@ func handleFollowInboxRequest(c context.Context, activity vocab.ActivityStreamsF
 		return fmt.Errorf("unable to handle request")
 	}
 
-	approved := !data.GetFederationIsPrivate()
+	approved := !configRepository.GetFederationIsPrivate()
 
 	followRequest := *follow
 
@@ -36,7 +38,7 @@ func handleFollowInboxRequest(c context.Context, activity vocab.ActivityStreamsF
 		return err
 	}
 
-	localAccountName := data.GetDefaultFederationUsername()
+	localAccountName := configRepository.GetDefaultFederationUsername()
 
 	if approved {
 		if err := requests.SendFollowAccept(follow.Inbox, activity, localAccountName); err != nil {

activitypub/inbox/worker.go

@@ -15,7 +15,7 @@ import (
 	"github.com/owncast/owncast/activitypub/apmodels"
 	"github.com/owncast/owncast/activitypub/persistence"
 	"github.com/owncast/owncast/activitypub/resolvers"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -131,7 +131,9 @@ func Verify(request *http.Request) (bool, error) {
 }
 
 func isBlockedDomain(domain string) bool {
-	blockedDomains := data.GetBlockedFederatedDomains()
+	configRepository := configrepository.Get()
+
+	blockedDomains := configRepository.GetBlockedFederatedDomains()
 
 	for _, blockedDomain := range blockedDomains {
 		if strings.Contains(domain, blockedDomain) {

activitypub/inbox/worker_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/owncast/owncast/activitypub/apmodels"
 	"github.com/owncast/owncast/activitypub/persistence"
 	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 )
 
 func makeFakePerson() vocab.ActivityStreamsPerson {
@@ -49,21 +50,24 @@ func makeFakePerson() vocab.ActivityStreamsPerson {
 
 func TestMain(m *testing.M) {
 	data.SetupPersistence(":memory:")
-	data.SetServerURL("https://my.cool.site.biz")
+	configRepository := configrepository.Get()
+	configRepository.SetServerURL("https://my.cool.site.biz")
 	persistence.Setup(data.GetDatastore())
 	m.Run()
 }
 
 func TestBlockedDomains(t *testing.T) {
+	configRepository := configrepository.Get()
+
 	person := makeFakePerson()
 
-	data.SetBlockedFederatedDomains([]string{"freedom.eagle", "guns.life"})
+	configRepository.SetBlockedFederatedDomains([]string{"freedom.eagle", "guns.life"})
 
-	if len(data.GetBlockedFederatedDomains()) != 2 {
+	if len(configRepository.GetBlockedFederatedDomains()) != 2 {
 		t.Error("Blocked federated domains is not set correctly")
 	}
 
-	for _, domain := range data.GetBlockedFederatedDomains() {
+	for _, domain := range configRepository.GetBlockedFederatedDomains() {
 		if domain == person.GetJSONLDId().GetIRI().Host {
 			return
 		}

activitypub/outbox/outbox.go

@@ -16,10 +16,10 @@ import (
 	"github.com/owncast/owncast/activitypub/resolvers"
 	"github.com/owncast/owncast/activitypub/webfinger"
 	"github.com/owncast/owncast/activitypub/workerpool"
+	"github.com/owncast/owncast/persistence/configrepository"
 	"github.com/pkg/errors"
 
 	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/core/data"
 	"github.com/owncast/owncast/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/teris-io/shortid"
@@ -27,7 +27,9 @@ import (
 
 // SendLive will send all followers the message saying you started a live stream.
 func SendLive() error {
-	textContent := data.GetFederationGoLiveMessage()
+	configRepository := configrepository.Get()
+
+	textContent := configRepository.GetFederationGoLiveMessage()
 
 	// If the message is empty then do not send it.
 	if textContent == "" {
@@ -38,7 +40,7 @@ func SendLive() error {
 	reg := regexp.MustCompile("[^a-zA-Z0-9]+")
 
 	tagProp := streams.NewActivityStreamsTagProperty()
-	for _, tagString := range data.GetServerMetadataTags() {
+	for _, tagString := range configRepository.GetServerMetadataTags() {
 		tagWithoutSpecialCharacters := reg.ReplaceAllString(tagString, "")
 		hashtag := apmodels.MakeHashtag(tagWithoutSpecialCharacters)
 		tagProp.AppendTootHashtag(hashtag)
@@ -57,15 +59,15 @@ func SendLive() error {
 	tagsString := strings.Join(tagStrings, " ")
 
 	var streamTitle string
-	if title := data.GetStreamTitle(); title != "" {
+	if title := configRepository.GetStreamTitle(); title != "" {
 		streamTitle = fmt.Sprintf("<p>%s</p>", title)
 	}
-	textContent = fmt.Sprintf("<p>%s</p>%s<p>%s</p><p><a href=\"%s\">%s</a></p>", textContent, streamTitle, tagsString, data.GetServerURL(), data.GetServerURL())
+	textContent = fmt.Sprintf("<p>%s</p>%s<p>%s</p><p><a href=\"%s\">%s</a></p>", textContent, streamTitle, tagsString, configRepository.GetServerURL(), configRepository.GetServerURL())
 
 	activity, _, note, noteID := createBaseOutboundMessage(textContent)
 
 	// To the public if we're not treating ActivityPub as "private".
-	if !data.GetFederationIsPrivate() {
+	if !configRepository.GetFederationIsPrivate() {
 		note = apmodels.MakeNotePublic(note)
 		activity = apmodels.MakeActivityPublic(activity)
 	}
@@ -73,7 +75,7 @@ func SendLive() error {
 	note.SetActivityStreamsTag(tagProp)
 
 	// Attach an image along with the Federated message.
-	previewURL, err := url.Parse(data.GetServerURL())
+	previewURL, err := url.Parse(configRepository.GetServerURL())
 	if err == nil {
 		var imageToAttach string
 		var mediaType string
@@ -94,7 +96,7 @@ func SendLive() error {
 		}
 	}
 
-	if data.GetNSFW() {
+	if configRepository.GetNSFW() {
 		// Mark content as sensitive.
 		sensitive := streams.NewActivityStreamsSensitiveProperty()
 		sensitive.AppendXMLSchemaBoolean(true)
@@ -151,6 +153,8 @@ func SendDirectMessageToAccount(textContent, account string) error {
 
 // SendPublicMessage will send a public message to all followers.
 func SendPublicMessage(textContent string) error {
+	configRepository := configrepository.Get()
+
 	originalContent := textContent
 	textContent = utils.RenderSimpleMarkdown(textContent)
 
@@ -173,7 +177,7 @@ func SendPublicMessage(textContent string) error {
 	activity, _, note, noteID := createBaseOutboundMessage(textContent)
 	note.SetActivityStreamsTag(tagProp)
 
-	if !data.GetFederationIsPrivate() {
+	if !configRepository.GetFederationIsPrivate() {
 		note = apmodels.MakeNotePublic(note)
 		activity = apmodels.MakeActivityPublic(activity)
 	}
@@ -197,7 +201,8 @@ func SendPublicMessage(textContent string) error {
 
 // nolint: unparam
 func createBaseOutboundMessage(textContent string) (vocab.ActivityStreamsCreate, string, vocab.ActivityStreamsNote, string) {
-	localActor := apmodels.MakeLocalIRIForAccount(data.GetDefaultFederationUsername())
+	configRepository := configrepository.Get()
+	localActor := apmodels.MakeLocalIRIForAccount(configRepository.GetDefaultFederationUsername())
 	noteID := shortid.MustGenerate()
 	noteIRI := apmodels.MakeLocalIRIForResource(noteID)
 	id := shortid.MustGenerate()
@@ -218,7 +223,8 @@ func getHashtagLinkHTMLFromTagString(baseHashtag string) string {
 
 // SendToFollowers will send an arbitrary payload to all follower inboxes.
 func SendToFollowers(payload []byte) error {
-	localActor := apmodels.MakeLocalIRIForAccount(data.GetDefaultFederationUsername())
+	configRepository := configrepository.Get()
+	localActor := apmodels.MakeLocalIRIForAccount(configRepository.GetDefaultFederationUsername())
 
 	followers, _, err := persistence.GetFederationFollowers(-1, 0)
 	if err != nil {
@@ -241,7 +247,8 @@ func SendToFollowers(payload []byte) error {
 
 // SendToUser will send a payload to a single specific inbox.
 func SendToUser(inbox *url.URL, payload []byte) error {
-	localActor := apmodels.MakeLocalIRIForAccount(data.GetDefaultFederationUsername())
+	configRepository := configrepository.Get()
+	localActor := apmodels.MakeLocalIRIForAccount(configRepository.GetDefaultFederationUsername())
 
 	req, err := requests.CreateSignedRequest(payload, inbox, localActor)
 	if err != nil {
@@ -255,8 +262,10 @@ func SendToUser(inbox *url.URL, payload []byte) error {
 
 // UpdateFollowersWithAccountUpdates will send an update to all followers alerting of a profile update.
 func UpdateFollowersWithAccountUpdates() error {
+	configRepository := configrepository.Get()
+
 	// Don't do anything if federation is disabled.
-	if !data.GetFederationEnabled() {
+	if !configRepository.GetFederationEnabled() {
 		return nil
 	}
 
@@ -265,7 +274,7 @@ func UpdateFollowersWithAccountUpdates() error {
 	activity := apmodels.MakeUpdateActivity(objectID)
 
 	actor := streams.NewActivityStreamsPerson()
-	actorID := apmodels.MakeLocalIRIForAccount(data.GetDefaultFederationUsername())
+	actorID := apmodels.MakeLocalIRIForAccount(configRepository.GetDefaultFederationUsername())
 	actorIDProperty := streams.NewJSONLDIdProperty()
 	actorIDProperty.Set(actorID)
 	actor.SetJSONLDId(actorIDProperty)

activitypub/persistence/followers.go

@@ -45,8 +45,8 @@ func GetFederationFollowers(limit int, offset int) ([]models.Follower, int, erro
 	}
 
 	followersResult, err := _datastore.GetQueries().GetFederationFollowersWithOffset(ctx, db.GetFederationFollowersWithOffsetParams{
-		Limit:  int32(limit),
-		Offset: int32(offset),
+		Limit:  limit,
+		Offset: offset,
 	})
 	if err != nil {
 		return nil, 0, err

activitypub/persistence/followers_fixture.go

@@ -0,0 +1,36 @@
+//go:build fixture
+// +build fixture
+
+package persistence
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+
+	"github.com/owncast/owncast/models"
+	log "github.com/sirupsen/logrus"
+)
+
+func addFollowersFixtureData() {
+	log.Println("Adding followers fixture data...")
+	file, err := os.Open("./test/fixture/followers_fixture.json")
+	if err != nil {
+		fmt.Println("Error opening file:", err)
+		return
+	}
+	defer file.Close()
+
+	var followers []models.Follower
+	decoder := json.NewDecoder(file)
+	err = decoder.Decode(&followers)
+	if err != nil {
+		fmt.Println("Error decoding JSON:", err)
+		return
+	}
+
+	// Iterate over the followers array
+	for _, follower := range followers {
+		createFollow(follower.ActorIRI, follower.Inbox, "", follower.Name, follower.Username, follower.Image, nil, true)
+	}
+}

activitypub/persistence/followers_nofixture.go

@@ -0,0 +1,8 @@
+//go:build !fixture
+// +build !fixture
+
+package persistence
+
+func addFollowersFixtureData() {
+	// no-op
+}

activitypub/persistence/persistence.go

@@ -27,6 +27,7 @@ func Setup(datastore *data.Datastore) {
 	createFederationFollowersTable()
 	createFederationOutboxTable()
 	createFederatedActivitiesTable()
+	addFollowersFixtureData()
 }
 
 // AddFollow will save a follow to the datastore.
@@ -236,7 +237,7 @@ func GetOutbox(limit int, offset int) (vocab.ActivityStreamsOrderedCollection, e
 	orderedItems := streams.NewActivityStreamsOrderedItemsProperty()
 	rows, err := _datastore.GetQueries().GetOutboxWithOffset(
 		context.Background(),
-		db.GetOutboxWithOffsetParams{Limit: int32(limit), Offset: int32(offset)},
+		db.GetOutboxWithOffsetParams{Limit: limit, Offset: offset},
 	)
 	if err != nil {
 		return collection, err
@@ -308,8 +309,8 @@ func SaveInboundFediverseActivity(objectIRI string, actorIRI string, eventType s
 func GetInboundActivities(limit int, offset int) ([]models.FederatedActivity, int, error) {
 	ctx := context.Background()
 	rows, err := _datastore.GetQueries().GetInboundActivitiesWithOffset(ctx, db.GetInboundActivitiesWithOffsetParams{
-		Limit:  int32(limit),
-		Offset: int32(offset),
+		Limit:  limit,
+		Offset: offset,
 	})
 	if err != nil {
 		return nil, 0, err

activitypub/resolvers/resolve.go

@@ -10,7 +10,7 @@ import (
 	"github.com/go-fed/activity/streams/vocab"
 	"github.com/owncast/owncast/activitypub/apmodels"
 	"github.com/owncast/owncast/activitypub/crypto"
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 )
@@ -47,11 +47,12 @@ func Resolve(c context.Context, data []byte, callbacks ...interface{}) error {
 
 // ResolveIRI will resolve an IRI ahd call the correct callback for the resolved type.
 func ResolveIRI(c context.Context, iri string, callbacks ...interface{}) error {
+	configRepository := configrepository.Get()
 	log.Debugln("Resolving", iri)
 
 	req, _ := http.NewRequest(http.MethodGet, iri, nil)
 
-	actor := apmodels.MakeLocalIRIForAccount(data.GetDefaultFederationUsername())
+	actor := apmodels.MakeLocalIRIForAccount(configRepository.GetDefaultFederationUsername())
 	if err := crypto.SignRequest(req, nil, actor); err != nil {
 		return err
 	}

activitypub/router.go

@@ -1,35 +0,0 @@
-package activitypub
-
-import (
-	"net/http"
-
-	"github.com/owncast/owncast/activitypub/controllers"
-	"github.com/owncast/owncast/router/middleware"
-)
-
-// StartRouter will start the federation specific http router.
-func StartRouter() {
-	// WebFinger
-	http.HandleFunc("/.well-known/webfinger", controllers.WebfingerHandler)
-
-	// Host Metadata
-	http.HandleFunc("/.well-known/host-meta", controllers.HostMetaController)
-
-	// Nodeinfo v1
-	http.HandleFunc("/.well-known/nodeinfo", controllers.NodeInfoController)
-
-	// x-nodeinfo v2
-	http.HandleFunc("/.well-known/x-nodeinfo2", controllers.XNodeInfo2Controller)
-
-	// Nodeinfo v2
-	http.HandleFunc("/nodeinfo/2.0", controllers.NodeInfoV2Controller)
-
-	// Instance details
-	http.HandleFunc("/api/v1/instance", controllers.InstanceV1Controller)
-
-	// Single ActivityPub Actor
-	http.HandleFunc("/federation/user/", middleware.RequireActivityPubOrRedirect(controllers.ActorHandler))
-
-	// Single AP object
-	http.HandleFunc("/federation/", middleware.RequireActivityPubOrRedirect(controllers.ObjectHandler))
-}

activitypub/workerpool/outbound.go

@@ -2,14 +2,10 @@ package workerpool
 
 import (
 	"net/http"
-	"runtime"
 
 	log "github.com/sirupsen/logrus"
 )
 
-// workerPoolSize defines the number of concurrent HTTP ActivityPub requests.
-var workerPoolSize = runtime.GOMAXPROCS(0)
-
 // Job struct bundling the ActivityPub and the payload in one struct.
 type Job struct {
 	request *http.Request
@@ -18,8 +14,8 @@ type Job struct {
 var queue chan Job
 
 // InitOutboundWorkerPool starts n go routines that await ActivityPub jobs.
-func InitOutboundWorkerPool() {
-	queue = make(chan Job)
+func InitOutboundWorkerPool(workerPoolSize int) {
+	queue = make(chan Job, workerPoolSize)
 
 	// start workers
 	for i := 1; i <= workerPoolSize; i++ {
@@ -29,8 +25,13 @@ func InitOutboundWorkerPool() {
 
 // AddToOutboundQueue will queue up an outbound http request.
 func AddToOutboundQueue(req *http.Request) {
+	select {
+	case queue <- Job{req}:
+	default:
+		log.Debugln("Outbound ActivityPub job queue is full")
+		queue <- Job{req} // will block until received by a worker at this point
+	}
 	log.Tracef("Queued request for ActivityPub destination %s", req.RequestURI)
-	queue <- Job{req}
 }
 
 func worker(workerID int, queue <-chan Job) {

auth/indieauth/client.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	"github.com/owncast/owncast/utils"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
@@ -47,6 +47,8 @@ func setupExpiredRequestPruner() {
 
 // StartAuthFlow will begin the IndieAuth flow by generating an auth request.
 func StartAuthFlow(authHost, userID, accessToken, displayName string) (*url.URL, error) {
+	configRepository := configrepository.Get()
+
 	// Limit the number of pending requests
 	if len(pendingAuthRequests) >= maxPendingRequests {
 		return nil, errors.New("Please try again later. Too many pending requests.")
@@ -68,7 +70,7 @@ func StartAuthFlow(authHost, userID, accessToken, displayName string) (*url.URL,
 		return nil, errors.New("only servers secured with https are supported")
 	}
 
-	serverURL := data.GetServerURL()
+	serverURL := configRepository.GetServerURL()
 	if serverURL == "" {
 		return nil, errors.New("Owncast server URL must be set when using auth")
 	}

auth/indieauth/server.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/persistence/configrepository"
 	"github.com/pkg/errors"
 	"github.com/teris-io/shortid"
 )
@@ -70,6 +70,8 @@ func StartServerAuth(clientID, redirectURI, codeChallenge, state, me string) (*S
 // CompleteServerAuth will verify that the values provided in the final step
 // of the IndieAuth flow are correct, and return some basic profile info.
 func CompleteServerAuth(code, redirectURI, clientID string, codeVerifier string) (*ServerProfileResponse, error) {
+	configRepository := configrepository.Get()
+
 	request, pending := pendingServerAuthRequests[code]
 	if !pending {
 		return nil, errors.New("no pending authentication request")
@@ -89,11 +91,11 @@ func CompleteServerAuth(code, redirectURI, clientID string, codeVerifier string)
 	}
 
 	response := ServerProfileResponse{
-		Me: data.GetServerURL(),
+		Me: configRepository.GetServerURL(),
 		Profile: ServerProfile{
-			Name:  data.GetServerName(),
-			URL:   data.GetServerURL(),
-			Photo: fmt.Sprintf("%s/%s", data.GetServerURL(), data.GetLogoPath()),
+			Name:  configRepository.GetServerName(),
+			URL:   configRepository.GetServerURL(),
+			Photo: fmt.Sprintf("%s/%s", configRepository.GetServerURL(), configRepository.GetLogoPath()),
 		},
 	}
 

auth/persistence.go

@@ -1,13 +1,7 @@
 package auth
 
 import (
-	"context"
-	"strings"
-
 	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/core/user"
-
-	"github.com/owncast/owncast/db"
 )
 
 var _datastore *data.Datastore
@@ -27,41 +21,3 @@ func Setup(db *data.Datastore) {
 	_datastore.MustExec(createTableSQL)
 	_datastore.MustExec(`CREATE INDEX IF NOT EXISTS idx_auth_token ON auth (token);`)
 }
-
-// AddAuth will add an external authentication token and type for a user.
-func AddAuth(userID, authToken string, authType Type) error {
-	return _datastore.GetQueries().AddAuthForUser(context.Background(), db.AddAuthForUserParams{
-		UserID: userID,
-		Token:  authToken,
-		Type:   string(authType),
-	})
-}
-
-// GetUserByAuth will return an existing user given auth details if a user
-// has previously authenticated with that method.
-func GetUserByAuth(authToken string, authType Type) *user.User {
-	u, err := _datastore.GetQueries().GetUserByAuth(context.Background(), db.GetUserByAuthParams{
-		Token: authToken,
-		Type:  string(authType),
-	})
-	if err != nil {
-		return nil
-	}
-
-	var scopes []string
-	if u.Scopes.Valid {
-		scopes = strings.Split(u.Scopes.String, ",")
-	}
-
-	return &user.User{
-		ID:              u.ID,
-		DisplayName:     u.DisplayName,
-		DisplayColor:    int(u.DisplayColor),
-		CreatedAt:       u.CreatedAt.Time,
-		DisabledAt:      &u.DisabledAt.Time,
-		PreviousNames:   strings.Split(u.PreviousNames.String, ","),
-		NameChangedAt:   &u.NamechangedAt.Time,
-		AuthenticatedAt: &u.AuthenticatedAt.Time,
-		Scopes:          scopes,
-	}
-}

build/gen-api.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@latest
+
+# setup
+package="generated"
+folderPath="webserver/handlers/generated"
+specPath="openapi.yaml"
+
+# validate scripts are installed
+if ! command -v redocly &>/dev/null; then
+	echo "Please install \`redocly cli\` before running this script: npm install -g @redocly/cli"
+	exit 1
+fi
+
+if ! command -v oapi-codegen &>/dev/null; then
+	echo "Please install \`oapi-codegen\` before running this script"
+	echo "Hint: run \`go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest\` to install"
+	exit 1
+fi
+
+# validate schema
+npx redocly lint $specPath
+if [ $? -ne 0 ]; then
+	echo "Open API specification is not valid"
+	exit 1
+fi
+
+# cleanup
+rm -r $folderPath
+mkdir -p $folderPath
+
+# codegen
+oapi-codegen -generate types -o $folderPath/$package-types.gen.go -package $package $specPath
+oapi-codegen -generate "chi-server" -o $folderPath/$package.gen.go -package $package $specPath
+
+# go
+go mod tidy

build/web/bundleWeb.sh

@@ -7,12 +7,12 @@ set -o pipefail
 
 OFFLINE=
 while [[ $# -gt 0 ]]; do
-  case $1 in
-    --offline)
-      OFFLINE=1
-      ;;
-  esac
-  shift
+	case $1 in
+	--offline)
+		OFFLINE=1
+		;;
+	esac
+	shift
 done
 
 # Change to the root directory of the repository
@@ -20,15 +20,14 @@ cd "$(git rev-parse --show-toplevel)"
 
 cd web
 
-if [ ! "$OFFLINE" ]
-then
-  echo "Installing npm modules for the owncast web..."
-  npm --silent install 2>/dev/null
+if [ ! "$OFFLINE" ]; then
+	echo "Installing npm modules for the owncast web..."
+	npm --silent install 2>/dev/null
 fi
 
 echo "Building owncast web..."
 rm -rf .next
-(node_modules/.bin/next build && node_modules/.bin/next export) | grep info
+node_modules/.bin/next build | grep info
 
 echo "Copying web project to dist directory..."
 

config/constants.go

@@ -4,7 +4,7 @@ import "path/filepath"
 
 const (
 	// StaticVersionNumber is the version of Owncast that is used when it's not overwritten via build-time settings.
-	StaticVersionNumber = "0.1.2" // Shown when you build from develop
+	StaticVersionNumber = "0.2.2" // Shown when you build from develop
 	// FfmpegSuggestedVersion is the version of ffmpeg we suggest.
 	FfmpegSuggestedVersion = "v4.1.5" // Requires the v
 	// DataDirectory is the directory we save data to.

config/defaults.go

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/owncast/owncast/models"
+	"github.com/owncast/owncast/webserver/handlers/generated"
 )
 
 // Defaults will hold default configuration values.
@@ -25,7 +26,7 @@ type Defaults struct {
 	WebServerIP        string
 	Name               string
 	AdminPassword      string
-	StreamKeys         []models.StreamKey
+	StreamKeys         []generated.StreamKey
 
 	StreamVariants []models.StreamOutputVariant
 
@@ -43,14 +44,16 @@ type Defaults struct {
 
 // GetDefaults will return default configuration values.
 func GetDefaults() Defaults {
+	defaultStreamKey := "abc123"
+	defaultStreamKeyComment := "Default stream key"
 	return Defaults{
 		Name:                 "New Owncast Server",
 		Summary:              "This is a new live video streaming server powered by Owncast.",
 		ServerWelcomeMessage: "",
 		Logo:                 "logo.svg",
 		AdminPassword:        "abc123",
-		StreamKeys: []models.StreamKey{
-			{Key: "abc123", Comment: "Default stream key"},
+		StreamKeys: []generated.StreamKey{
+			{Key: &defaultStreamKey, Comment: &defaultStreamKeyComment},
 		},
 		Tags: []string{
 			"owncast",

controllers/admin.go

@@ -1,13 +0,0 @@
-package controllers
-
-import (
-	"net/http"
-
-	"github.com/owncast/owncast/core/rtmp"
-)
-
-// DisconnectInboundConnection will force-disconnect an inbound stream.
-func DisconnectInboundConnection(w http.ResponseWriter, r *http.Request) {
-	rtmp.Disconnect()
-	w.WriteHeader(http.StatusOK)
-}

controllers/admin/appearance.go

@@ -1,35 +0,0 @@
-package admin
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"github.com/owncast/owncast/controllers"
-	"github.com/owncast/owncast/core/data"
-)
-
-// SetCustomColorVariableValues sets the custom color variables.
-func SetCustomColorVariableValues(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	type request struct {
-		Value map[string]string `json:"value"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var values request
-
-	if err := decoder.Decode(&values); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update appearance variable values")
-		return
-	}
-
-	if err := data.SetCustomColorVariableValues(values.Value); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "custom appearance variables updated")
-}

controllers/admin/chat.go

@@ -1,375 +0,0 @@
-package admin
-
-// this is endpoint logic
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"strconv"
-
-	"github.com/owncast/owncast/controllers"
-	"github.com/owncast/owncast/core/chat"
-	"github.com/owncast/owncast/core/chat/events"
-	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/core/user"
-	"github.com/owncast/owncast/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-// ExternalUpdateMessageVisibility updates an array of message IDs to have the same visiblity.
-func ExternalUpdateMessageVisibility(integration user.ExternalAPIUser, w http.ResponseWriter, r *http.Request) {
-	UpdateMessageVisibility(w, r)
-}
-
-// UpdateMessageVisibility updates an array of message IDs to have the same visiblity.
-func UpdateMessageVisibility(w http.ResponseWriter, r *http.Request) {
-	type messageVisibilityUpdateRequest struct {
-		IDArray []string `json:"idArray"`
-		Visible bool     `json:"visible"`
-	}
-
-	if r.Method != controllers.POST {
-		// nolint:goconst
-		controllers.WriteSimpleResponse(w, false, r.Method+" not supported")
-		return
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var request messageVisibilityUpdateRequest
-
-	if err := decoder.Decode(&request); err != nil {
-		log.Errorln(err)
-		controllers.WriteSimpleResponse(w, false, "")
-		return
-	}
-
-	if err := chat.SetMessagesVisibility(request.IDArray, request.Visible); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// BanIPAddress will manually ban an IP address.
-func BanIPAddress(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		controllers.WriteSimpleResponse(w, false, "unable to ban IP address")
-		return
-	}
-
-	if err := data.BanIPAddress(configValue.Value.(string), "manually added"); err != nil {
-		controllers.WriteSimpleResponse(w, false, "error saving IP address ban")
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "IP address banned")
-}
-
-// UnBanIPAddress will remove an IP address ban.
-func UnBanIPAddress(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		controllers.WriteSimpleResponse(w, false, "unable to unban IP address")
-		return
-	}
-
-	if err := data.RemoveIPAddressBan(configValue.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, "error removing IP address ban")
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "IP address unbanned")
-}
-
-// GetIPAddressBans will return all the banned IP addresses.
-func GetIPAddressBans(w http.ResponseWriter, r *http.Request) {
-	bans, err := data.GetIPAddressBans()
-	if err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteResponse(w, bans)
-}
-
-// UpdateUserEnabled enable or disable a single user by ID.
-func UpdateUserEnabled(w http.ResponseWriter, r *http.Request) {
-	type blockUserRequest struct {
-		UserID  string `json:"userId"`
-		Enabled bool   `json:"enabled"`
-	}
-
-	if r.Method != controllers.POST {
-		controllers.WriteSimpleResponse(w, false, r.Method+" not supported")
-		return
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var request blockUserRequest
-
-	if err := decoder.Decode(&request); err != nil {
-		log.Errorln(err)
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	if request.UserID == "" {
-		controllers.WriteSimpleResponse(w, false, "must provide userId")
-		return
-	}
-
-	// Disable/enable the user
-	if err := user.SetEnabled(request.UserID, request.Enabled); err != nil {
-		log.Errorln("error changing user enabled status", err)
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	// Hide/show the user's chat messages if disabling.
-	// Leave hidden messages hidden to be safe.
-	if !request.Enabled {
-		if err := chat.SetMessageVisibilityForUserID(request.UserID, request.Enabled); err != nil {
-			log.Errorln("error changing user messages visibility", err)
-			controllers.WriteSimpleResponse(w, false, err.Error())
-			return
-		}
-	}
-
-	// Forcefully disconnect the user from the chat
-	if !request.Enabled {
-		clients, err := chat.GetClientsForUser(request.UserID)
-		if len(clients) == 0 {
-			// Nothing to do
-			return
-		}
-
-		if err != nil {
-			log.Errorln("error fetching clients for user: ", err)
-			controllers.WriteSimpleResponse(w, false, err.Error())
-			return
-		}
-
-		chat.DisconnectClients(clients)
-		disconnectedUser := user.GetUserByID(request.UserID)
-		_ = chat.SendSystemAction(fmt.Sprintf("**%s** has been removed from chat.", disconnectedUser.DisplayName), true)
-
-		localIP4Address := "127.0.0.1"
-		localIP6Address := "::1"
-
-		// Ban this user's IP address.
-		for _, client := range clients {
-			ipAddress := client.IPAddress
-			if ipAddress != localIP4Address && ipAddress != localIP6Address {
-				reason := fmt.Sprintf("Banning of %s", disconnectedUser.DisplayName)
-				if err := data.BanIPAddress(ipAddress, reason); err != nil {
-					log.Errorln("error banning IP address: ", err)
-				}
-			}
-		}
-	}
-
-	controllers.WriteSimpleResponse(w, true, fmt.Sprintf("%s enabled: %t", request.UserID, request.Enabled))
-}
-
-// GetDisabledUsers will return all the disabled users.
-func GetDisabledUsers(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	users := user.GetDisabledUsers()
-	controllers.WriteResponse(w, users)
-}
-
-// UpdateUserModerator will set the moderator status for a user ID.
-func UpdateUserModerator(w http.ResponseWriter, r *http.Request) {
-	type request struct {
-		UserID      string `json:"userId"`
-		IsModerator bool   `json:"isModerator"`
-	}
-
-	if r.Method != controllers.POST {
-		controllers.WriteSimpleResponse(w, false, r.Method+" not supported")
-		return
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var req request
-
-	if err := decoder.Decode(&req); err != nil {
-		controllers.WriteSimpleResponse(w, false, "")
-		return
-	}
-
-	// Update the user object with new moderation access.
-	if err := user.SetModerator(req.UserID, req.IsModerator); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	// Update the clients for this user to know about the moderator access change.
-	if err := chat.SendConnectedClientInfoToUser(req.UserID); err != nil {
-		log.Debugln(err)
-	}
-
-	controllers.WriteSimpleResponse(w, true, fmt.Sprintf("%s is moderator: %t", req.UserID, req.IsModerator))
-}
-
-// GetModerators will return a list of moderator users.
-func GetModerators(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	users := user.GetModeratorUsers()
-	controllers.WriteResponse(w, users)
-}
-
-// GetChatMessages returns all of the chat messages, unfiltered.
-func GetChatMessages(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	messages := chat.GetChatModerationHistory()
-	controllers.WriteResponse(w, messages)
-}
-
-// SendSystemMessage will send an official "SYSTEM" message to chat on behalf of your server.
-func SendSystemMessage(integration user.ExternalAPIUser, w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	var message events.SystemMessageEvent
-	if err := json.NewDecoder(r.Body).Decode(&message); err != nil {
-		controllers.InternalErrorHandler(w, err)
-		return
-	}
-
-	if err := chat.SendSystemMessage(message.Body, false); err != nil {
-		controllers.BadRequestHandler(w, err)
-	}
-
-	controllers.WriteSimpleResponse(w, true, "sent")
-}
-
-// SendSystemMessageToConnectedClient will handle incoming requests to send a single message to a single connected client by ID.
-func SendSystemMessageToConnectedClient(integration user.ExternalAPIUser, w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-	clientIDText, err := utils.ReadRestURLParameter(r, "clientId")
-	if err != nil {
-		controllers.BadRequestHandler(w, err)
-		return
-	}
-
-	clientIDNumeric, err := strconv.ParseUint(clientIDText, 10, 32)
-	if err != nil {
-		controllers.BadRequestHandler(w, err)
-		return
-	}
-
-	var message events.SystemMessageEvent
-	if err := json.NewDecoder(r.Body).Decode(&message); err != nil {
-		controllers.InternalErrorHandler(w, err)
-		return
-	}
-
-	chat.SendSystemMessageToClient(uint(clientIDNumeric), message.Body)
-	controllers.WriteSimpleResponse(w, true, "sent")
-}
-
-// SendUserMessage will send a message to chat on behalf of a user. *Depreciated*.
-func SendUserMessage(integration user.ExternalAPIUser, w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-	controllers.BadRequestHandler(w, errors.New("no longer supported. see /api/integrations/chat/send"))
-}
-
-// SendIntegrationChatMessage will send a chat message on behalf of an external chat integration.
-func SendIntegrationChatMessage(integration user.ExternalAPIUser, w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	name := integration.DisplayName
-
-	if name == "" {
-		controllers.BadRequestHandler(w, errors.New("unknown integration for provided access token"))
-		return
-	}
-
-	var event events.UserMessageEvent
-	if err := json.NewDecoder(r.Body).Decode(&event); err != nil {
-		controllers.InternalErrorHandler(w, err)
-		return
-	}
-	event.SetDefaults()
-	event.RenderBody()
-	event.Type = "CHAT"
-
-	if event.Empty() {
-		controllers.BadRequestHandler(w, errors.New("invalid message"))
-		return
-	}
-
-	event.User = &user.User{
-		ID:           integration.ID,
-		DisplayName:  name,
-		DisplayColor: integration.DisplayColor,
-		CreatedAt:    integration.CreatedAt,
-		IsBot:        true,
-	}
-
-	if err := chat.Broadcast(&event); err != nil {
-		controllers.BadRequestHandler(w, err)
-		return
-	}
-
-	chat.SaveUserMessage(event)
-
-	controllers.WriteSimpleResponse(w, true, "sent")
-}
-
-// SendChatAction will send a generic chat action.
-func SendChatAction(integration user.ExternalAPIUser, w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	var message events.SystemActionEvent
-	if err := json.NewDecoder(r.Body).Decode(&message); err != nil {
-		controllers.InternalErrorHandler(w, err)
-		return
-	}
-
-	message.SetDefaults()
-	message.RenderBody()
-
-	if err := chat.SendSystemAction(message.Body, false); err != nil {
-		controllers.BadRequestHandler(w, err)
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "sent")
-}
-
-// SetEnableEstablishedChatUserMode sets the requirement for a chat user
-// to be "established" for some time before taking part in chat.
-func SetEnableEstablishedChatUserMode(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		controllers.WriteSimpleResponse(w, false, "unable to update chat established user only mode")
-		return
-	}
-
-	if err := data.SetChatEstablishedUsersOnlyMode(configValue.Value.(bool)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "chat established users only mode updated")
-}

controllers/admin/externalAPIUsers.go

@@ -1,102 +0,0 @@
-package admin
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-	"time"
-
-	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/controllers"
-	"github.com/owncast/owncast/core/user"
-	"github.com/owncast/owncast/utils"
-)
-
-type deleteExternalAPIUserRequest struct {
-	Token string `json:"token"`
-}
-
-type createExternalAPIUserRequest struct {
-	Name   string   `json:"name"`
-	Scopes []string `json:"scopes"`
-}
-
-// CreateExternalAPIUser will generate a 3rd party access token.
-func CreateExternalAPIUser(w http.ResponseWriter, r *http.Request) {
-	decoder := json.NewDecoder(r.Body)
-	var request createExternalAPIUserRequest
-	if err := decoder.Decode(&request); err != nil {
-		controllers.BadRequestHandler(w, err)
-		return
-	}
-
-	// Verify all the scopes provided are valid
-	if !user.HasValidScopes(request.Scopes) {
-		controllers.BadRequestHandler(w, errors.New("one or more invalid scopes provided"))
-		return
-	}
-
-	token, err := utils.GenerateAccessToken()
-	if err != nil {
-		controllers.InternalErrorHandler(w, err)
-		return
-	}
-
-	color := utils.GenerateRandomDisplayColor(config.MaxUserColor)
-
-	if err := user.InsertExternalAPIUser(token, request.Name, color, request.Scopes); err != nil {
-		controllers.InternalErrorHandler(w, err)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	controllers.WriteResponse(w, user.ExternalAPIUser{
-		AccessToken:  token,
-		DisplayName:  request.Name,
-		DisplayColor: color,
-		Scopes:       request.Scopes,
-		CreatedAt:    time.Now(),
-		LastUsedAt:   nil,
-	})
-}
-
-// GetExternalAPIUsers will return all 3rd party access tokens.
-func GetExternalAPIUsers(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	tokens, err := user.GetExternalAPIUser()
-	if err != nil {
-		controllers.InternalErrorHandler(w, err)
-		return
-	}
-	controllers.WriteResponse(w, tokens)
-}
-
-// DeleteExternalAPIUser will return a single 3rd party access token.
-func DeleteExternalAPIUser(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	if r.Method != controllers.POST {
-		controllers.WriteSimpleResponse(w, false, r.Method+" not supported")
-		return
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var request deleteExternalAPIUserRequest
-	if err := decoder.Decode(&request); err != nil {
-		controllers.BadRequestHandler(w, err)
-		return
-	}
-
-	if request.Token == "" {
-		controllers.BadRequestHandler(w, errors.New("must provide a token"))
-		return
-	}
-
-	if err := user.DeleteExternalAPIUser(request.Token); err != nil {
-		controllers.InternalErrorHandler(w, err)
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "deleted token")
-}

controllers/admin/followers.go

@@ -1,82 +0,0 @@
-package admin
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"github.com/owncast/owncast/activitypub/persistence"
-	"github.com/owncast/owncast/activitypub/requests"
-	"github.com/owncast/owncast/controllers"
-	"github.com/owncast/owncast/core/data"
-)
-
-// ApproveFollower will approve a federated follow request.
-func ApproveFollower(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	type approveFollowerRequest struct {
-		ActorIRI string `json:"actorIRI"`
-		Approved bool   `json:"approved"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var approval approveFollowerRequest
-	if err := decoder.Decode(&approval); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to handle follower state with provided values")
-		return
-	}
-
-	if approval.Approved {
-		// Approve a follower
-		if err := persistence.ApprovePreviousFollowRequest(approval.ActorIRI); err != nil {
-			controllers.WriteSimpleResponse(w, false, err.Error())
-			return
-		}
-
-		localAccountName := data.GetDefaultFederationUsername()
-
-		followRequest, err := persistence.GetFollower(approval.ActorIRI)
-		if err != nil {
-			controllers.WriteSimpleResponse(w, false, err.Error())
-			return
-		}
-
-		// Send the approval to the follow requestor.
-		if err := requests.SendFollowAccept(followRequest.Inbox, followRequest.RequestObject, localAccountName); err != nil {
-			controllers.WriteSimpleResponse(w, false, err.Error())
-			return
-		}
-	} else {
-		// Remove/block a follower
-		if err := persistence.BlockOrRejectFollower(approval.ActorIRI); err != nil {
-			controllers.WriteSimpleResponse(w, false, err.Error())
-			return
-		}
-	}
-
-	controllers.WriteSimpleResponse(w, true, "follower updated")
-}
-
-// GetPendingFollowRequests will return a list of pending follow requests.
-func GetPendingFollowRequests(w http.ResponseWriter, r *http.Request) {
-	requests, err := persistence.GetPendingFollowRequests()
-	if err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteResponse(w, requests)
-}
-
-// GetBlockedAndRejectedFollowers will return blocked and rejected followers.
-func GetBlockedAndRejectedFollowers(w http.ResponseWriter, r *http.Request) {
-	rejections, err := persistence.GetBlockedAndRejectedFollowers()
-	if err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteResponse(w, rejections)
-}

controllers/admin/serverConfig.go

@@ -1,170 +0,0 @@
-package admin
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/core/transcoder"
-	"github.com/owncast/owncast/models"
-	"github.com/owncast/owncast/router/middleware"
-	"github.com/owncast/owncast/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-// GetServerConfig gets the config details of the server.
-func GetServerConfig(w http.ResponseWriter, r *http.Request) {
-	ffmpeg := utils.ValidatedFfmpegPath(data.GetFfMpegPath())
-	usernameBlocklist := data.GetForbiddenUsernameList()
-	usernameSuggestions := data.GetSuggestedUsernamesList()
-
-	videoQualityVariants := make([]models.StreamOutputVariant, 0)
-	for _, variant := range data.GetStreamOutputVariants() {
-		videoQualityVariants = append(videoQualityVariants, models.StreamOutputVariant{
-			Name:               variant.GetName(),
-			IsAudioPassthrough: variant.GetIsAudioPassthrough(),
-			IsVideoPassthrough: variant.IsVideoPassthrough,
-			Framerate:          variant.GetFramerate(),
-			VideoBitrate:       variant.VideoBitrate,
-			AudioBitrate:       variant.AudioBitrate,
-			CPUUsageLevel:      variant.CPUUsageLevel,
-			ScaledWidth:        variant.ScaledWidth,
-			ScaledHeight:       variant.ScaledHeight,
-		})
-	}
-	response := serverConfigAdminResponse{
-		InstanceDetails: webConfigResponse{
-			Name:                data.GetServerName(),
-			Summary:             data.GetServerSummary(),
-			Tags:                data.GetServerMetadataTags(),
-			ExtraPageContent:    data.GetExtraPageBodyContent(),
-			StreamTitle:         data.GetStreamTitle(),
-			WelcomeMessage:      data.GetServerWelcomeMessage(),
-			OfflineMessage:      data.GetCustomOfflineMessage(),
-			Logo:                data.GetLogoPath(),
-			SocialHandles:       data.GetSocialHandles(),
-			NSFW:                data.GetNSFW(),
-			CustomStyles:        data.GetCustomStyles(),
-			CustomJavascript:    data.GetCustomJavascript(),
-			AppearanceVariables: data.GetCustomColorVariableValues(),
-		},
-		FFmpegPath:              ffmpeg,
-		AdminPassword:           data.GetAdminPassword(),
-		StreamKeys:              data.GetStreamKeys(),
-		StreamKeyOverridden:     config.TemporaryStreamKey != "",
-		WebServerPort:           config.WebServerPort,
-		WebServerIP:             config.WebServerIP,
-		RTMPServerPort:          data.GetRTMPPortNumber(),
-		ChatDisabled:            data.GetChatDisabled(),
-		ChatJoinMessagesEnabled: data.GetChatJoinPartMessagesEnabled(),
-		SocketHostOverride:      data.GetWebsocketOverrideHost(),
-		VideoServingEndpoint:    data.GetVideoServingEndpoint(),
-		ChatEstablishedUserMode: data.GetChatEstbalishedUsersOnlyMode(),
-		HideViewerCount:         data.GetHideViewerCount(),
-		DisableSearchIndexing:   data.GetDisableSearchIndexing(),
-		VideoSettings: videoSettings{
-			VideoQualityVariants: videoQualityVariants,
-			LatencyLevel:         data.GetStreamLatencyLevel().Level,
-		},
-		YP: yp{
-			Enabled:     data.GetDirectoryEnabled(),
-			InstanceURL: data.GetServerURL(),
-		},
-		S3:                 data.GetS3Config(),
-		ExternalActions:    data.GetExternalActions(),
-		SupportedCodecs:    transcoder.GetCodecs(ffmpeg),
-		VideoCodec:         data.GetVideoCodec(),
-		ForbiddenUsernames: usernameBlocklist,
-		SuggestedUsernames: usernameSuggestions,
-		Federation: federationConfigResponse{
-			Enabled:        data.GetFederationEnabled(),
-			IsPrivate:      data.GetFederationIsPrivate(),
-			Username:       data.GetFederationUsername(),
-			GoLiveMessage:  data.GetFederationGoLiveMessage(),
-			ShowEngagement: data.GetFederationShowEngagement(),
-			BlockedDomains: data.GetBlockedFederatedDomains(),
-		},
-		Notifications: notificationsConfigResponse{
-			Discord: data.GetDiscordConfig(),
-			Browser: data.GetBrowserPushConfig(),
-		},
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	middleware.DisableCache(w)
-
-	if err := json.NewEncoder(w).Encode(response); err != nil {
-		log.Errorln(err)
-	}
-}
-
-type serverConfigAdminResponse struct {
-	InstanceDetails         webConfigResponse           `json:"instanceDetails"`
-	Notifications           notificationsConfigResponse `json:"notifications"`
-	YP                      yp                          `json:"yp"`
-	FFmpegPath              string                      `json:"ffmpegPath"`
-	AdminPassword           string                      `json:"adminPassword"`
-	SocketHostOverride      string                      `json:"socketHostOverride,omitempty"`
-	WebServerIP             string                      `json:"webServerIP"`
-	VideoCodec              string                      `json:"videoCodec"`
-	VideoServingEndpoint    string                      `json:"videoServingEndpoint"`
-	S3                      models.S3                   `json:"s3"`
-	Federation              federationConfigResponse    `json:"federation"`
-	SupportedCodecs         []string                    `json:"supportedCodecs"`
-	ExternalActions         []models.ExternalAction     `json:"externalActions"`
-	ForbiddenUsernames      []string                    `json:"forbiddenUsernames"`
-	SuggestedUsernames      []string                    `json:"suggestedUsernames"`
-	StreamKeys              []models.StreamKey          `json:"streamKeys"`
-	VideoSettings           videoSettings               `json:"videoSettings"`
-	RTMPServerPort          int                         `json:"rtmpServerPort"`
-	WebServerPort           int                         `json:"webServerPort"`
-	ChatDisabled            bool                        `json:"chatDisabled"`
-	ChatJoinMessagesEnabled bool                        `json:"chatJoinMessagesEnabled"`
-	ChatEstablishedUserMode bool                        `json:"chatEstablishedUserMode"`
-	DisableSearchIndexing   bool                        `json:"disableSearchIndexing"`
-	StreamKeyOverridden     bool                        `json:"streamKeyOverridden"`
-	HideViewerCount         bool                        `json:"hideViewerCount"`
-}
-
-type videoSettings struct {
-	VideoQualityVariants []models.StreamOutputVariant `json:"videoQualityVariants"`
-	LatencyLevel         int                          `json:"latencyLevel"`
-}
-
-type webConfigResponse struct {
-	AppearanceVariables map[string]string     `json:"appearanceVariables"`
-	Version             string                `json:"version"`
-	WelcomeMessage      string                `json:"welcomeMessage"`
-	OfflineMessage      string                `json:"offlineMessage"`
-	Logo                string                `json:"logo"`
-	Name                string                `json:"name"`
-	ExtraPageContent    string                `json:"extraPageContent"`
-	StreamTitle         string                `json:"streamTitle"` // What's going on with the current stream
-	CustomStyles        string                `json:"customStyles"`
-	CustomJavascript    string                `json:"customJavascript"`
-	Summary             string                `json:"summary"`
-	Tags                []string              `json:"tags"`
-	SocialHandles       []models.SocialHandle `json:"socialHandles"`
-	NSFW                bool                  `json:"nsfw"`
-}
-
-type yp struct {
-	InstanceURL  string `json:"instanceUrl"` // The public URL the directory should link to
-	YPServiceURL string `json:"-"`           // The base URL to the YP API to register with (optional)
-	Enabled      bool   `json:"enabled"`
-}
-
-type federationConfigResponse struct {
-	Username       string   `json:"username"`
-	GoLiveMessage  string   `json:"goLiveMessage"`
-	BlockedDomains []string `json:"blockedDomains"`
-	Enabled        bool     `json:"enabled"`
-	IsPrivate      bool     `json:"isPrivate"`
-	ShowEngagement bool     `json:"showEngagement"`
-}
-
-type notificationsConfigResponse struct {
-	Browser models.BrowserNotificationConfiguration `json:"browser"`
-	Discord models.DiscordConfiguration             `json:"discord"`
-}

controllers/admin/yp.go

@@ -1,20 +0,0 @@
-package admin
-
-import (
-	"net/http"
-
-	"github.com/owncast/owncast/controllers"
-	"github.com/owncast/owncast/core/data"
-	log "github.com/sirupsen/logrus"
-)
-
-// ResetYPRegistration will clear the YP protocol registration key.
-func ResetYPRegistration(w http.ResponseWriter, r *http.Request) {
-	log.Traceln("Resetting YP registration key")
-	if err := data.SetDirectoryRegistrationKey(""); err != nil {
-		log.Errorln(err)
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-	controllers.WriteSimpleResponse(w, true, "reset")
-}

controllers/chat.go

@@ -1,99 +0,0 @@
-package controllers
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/core/chat"
-	"github.com/owncast/owncast/core/user"
-	"github.com/owncast/owncast/router/middleware"
-	"github.com/owncast/owncast/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-// ExternalGetChatMessages gets all of the chat messages.
-func ExternalGetChatMessages(integration user.ExternalAPIUser, w http.ResponseWriter, r *http.Request) {
-	middleware.EnableCors(w)
-	getChatMessages(w, r)
-}
-
-// GetChatMessages gets all of the chat messages.
-func GetChatMessages(u user.User, w http.ResponseWriter, r *http.Request) {
-	middleware.EnableCors(w)
-	getChatMessages(w, r)
-}
-
-func getChatMessages(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	switch r.Method {
-	case http.MethodGet:
-		messages := chat.GetChatHistory()
-
-		if err := json.NewEncoder(w).Encode(messages); err != nil {
-			log.Debugln(err)
-		}
-	default:
-		w.WriteHeader(http.StatusNotImplemented)
-		if err := json.NewEncoder(w).Encode(j{"error": "method not implemented (PRs are accepted)"}); err != nil {
-			InternalErrorHandler(w, err)
-		}
-	}
-}
-
-// RegisterAnonymousChatUser will register a new user.
-func RegisterAnonymousChatUser(w http.ResponseWriter, r *http.Request) {
-	middleware.EnableCors(w)
-
-	if r.Method == "OPTIONS" {
-		// All OPTIONS requests should have a wildcard CORS header.
-		w.Header().Set("Access-Control-Allow-Origin", "*")
-		w.WriteHeader(http.StatusNoContent)
-		return
-	}
-
-	if r.Method != http.MethodPost {
-		// nolint:goconst
-		WriteSimpleResponse(w, false, r.Method+" not supported")
-		return
-	}
-
-	type registerAnonymousUserRequest struct {
-		DisplayName string `json:"displayName"`
-	}
-
-	type registerAnonymousUserResponse struct {
-		ID          string `json:"id"`
-		AccessToken string `json:"accessToken"`
-		DisplayName string `json:"displayName"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var request registerAnonymousUserRequest
-	if err := decoder.Decode(&request); err != nil { //nolint
-		// this is fine. register a new user anyway.
-	}
-
-	if request.DisplayName == "" {
-		request.DisplayName = r.Header.Get("X-Forwarded-User")
-	}
-
-	proposedNewDisplayName := utils.MakeSafeStringOfLength(request.DisplayName, config.MaxChatDisplayNameLength)
-	newUser, accessToken, err := user.CreateAnonymousUser(proposedNewDisplayName)
-	if err != nil {
-		WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	response := registerAnonymousUserResponse{
-		ID:          newUser.ID,
-		AccessToken: accessToken,
-		DisplayName: newUser.DisplayName,
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	middleware.DisableCache(w)
-
-	WriteResponse(w, response)
-}

controllers/config.go

@@ -1,153 +0,0 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/url"
-
-	"github.com/owncast/owncast/activitypub"
-	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/models"
-	"github.com/owncast/owncast/router/middleware"
-	"github.com/owncast/owncast/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-type webConfigResponse struct {
-	AppearanceVariables  map[string]string            `json:"appearanceVariables"`
-	Name                 string                       `json:"name"`
-	CustomStyles         string                       `json:"customStyles"`
-	StreamTitle          string                       `json:"streamTitle,omitempty"` // What's going on with the current stream
-	OfflineMessage       string                       `json:"offlineMessage"`
-	Logo                 string                       `json:"logo"`
-	Version              string                       `json:"version"`
-	SocketHostOverride   string                       `json:"socketHostOverride,omitempty"`
-	ExtraPageContent     string                       `json:"extraPageContent"`
-	Summary              string                       `json:"summary"`
-	Tags                 []string                     `json:"tags"`
-	SocialHandles        []models.SocialHandle        `json:"socialHandles"`
-	ExternalActions      []models.ExternalAction      `json:"externalActions"`
-	Notifications        notificationsConfigResponse  `json:"notifications"`
-	Federation           federationConfigResponse     `json:"federation"`
-	MaxSocketPayloadSize int                          `json:"maxSocketPayloadSize"`
-	HideViewerCount      bool                         `json:"hideViewerCount"`
-	ChatDisabled         bool                         `json:"chatDisabled"`
-	NSFW                 bool                         `json:"nsfw"`
-	Authentication       authenticationConfigResponse `json:"authentication"`
-}
-
-type federationConfigResponse struct {
-	Account       string `json:"account,omitempty"`
-	FollowerCount int    `json:"followerCount,omitempty"`
-	Enabled       bool   `json:"enabled"`
-}
-
-type browserNotificationsConfigResponse struct {
-	PublicKey string `json:"publicKey,omitempty"`
-	Enabled   bool   `json:"enabled"`
-}
-
-type notificationsConfigResponse struct {
-	Browser browserNotificationsConfigResponse `json:"browser"`
-}
-
-type authenticationConfigResponse struct {
-	IndieAuthEnabled bool `json:"indieAuthEnabled"`
-}
-
-// GetWebConfig gets the status of the server.
-func GetWebConfig(w http.ResponseWriter, r *http.Request) {
-	middleware.EnableCors(w)
-	middleware.DisableCache(w)
-	w.Header().Set("Content-Type", "application/json")
-
-	configuration := getConfigResponse()
-
-	if err := json.NewEncoder(w).Encode(configuration); err != nil {
-		BadRequestHandler(w, err)
-	}
-}
-
-func getConfigResponse() webConfigResponse {
-	pageContent := utils.RenderPageContentMarkdown(data.GetExtraPageBodyContent())
-	offlineMessage := utils.RenderSimpleMarkdown(data.GetCustomOfflineMessage())
-	socialHandles := data.GetSocialHandles()
-	for i, handle := range socialHandles {
-		platform := models.GetSocialHandle(handle.Platform)
-		if platform != nil {
-			handle.Icon = platform.Icon
-			socialHandles[i] = handle
-		}
-	}
-
-	serverSummary := data.GetServerSummary()
-
-	var federationResponse federationConfigResponse
-	federationEnabled := data.GetFederationEnabled()
-
-	followerCount, _ := activitypub.GetFollowerCount()
-	if federationEnabled {
-		serverURLString := data.GetServerURL()
-		serverURL, _ := url.Parse(serverURLString)
-		account := fmt.Sprintf("%s@%s", data.GetDefaultFederationUsername(), serverURL.Host)
-		federationResponse = federationConfigResponse{
-			Enabled:       federationEnabled,
-			FollowerCount: int(followerCount),
-			Account:       account,
-		}
-	}
-
-	browserPushEnabled := data.GetBrowserPushConfig().Enabled
-	browserPushPublicKey, err := data.GetBrowserPushPublicKey()
-	if err != nil {
-		log.Errorln("unable to fetch browser push notifications public key", err)
-		browserPushEnabled = false
-	}
-
-	notificationsResponse := notificationsConfigResponse{
-		Browser: browserNotificationsConfigResponse{
-			Enabled:   browserPushEnabled,
-			PublicKey: browserPushPublicKey,
-		},
-	}
-
-	authenticationResponse := authenticationConfigResponse{
-		IndieAuthEnabled: data.GetServerURL() != "",
-	}
-
-	return webConfigResponse{
-		Name:                 data.GetServerName(),
-		Summary:              serverSummary,
-		OfflineMessage:       offlineMessage,
-		Logo:                 "/logo",
-		Tags:                 data.GetServerMetadataTags(),
-		Version:              config.GetReleaseString(),
-		NSFW:                 data.GetNSFW(),
-		SocketHostOverride:   data.GetWebsocketOverrideHost(),
-		ExtraPageContent:     pageContent,
-		StreamTitle:          data.GetStreamTitle(),
-		SocialHandles:        socialHandles,
-		ChatDisabled:         data.GetChatDisabled(),
-		ExternalActions:      data.GetExternalActions(),
-		CustomStyles:         data.GetCustomStyles(),
-		MaxSocketPayloadSize: config.MaxSocketPayloadSize,
-		Federation:           federationResponse,
-		Notifications:        notificationsResponse,
-		Authentication:       authenticationResponse,
-		AppearanceVariables:  data.GetCustomColorVariableValues(),
-		HideViewerCount:      data.GetHideViewerCount(),
-	}
-}
-
-// GetAllSocialPlatforms will return a list of all social platform types.
-func GetAllSocialPlatforms(w http.ResponseWriter, r *http.Request) {
-	middleware.EnableCors(w)
-	w.Header().Set("Content-Type", "application/json")
-
-	platforms := models.GetAllSocialHandles()
-	if err := json.NewEncoder(w).Encode(platforms); err != nil {
-		InternalErrorHandler(w, err)
-	}
-}

controllers/constants.go

@@ -1,7 +0,0 @@
-package controllers
-
-// POST is the HTTP POST method.
-const POST = "POST"
-
-// GET is the HTTP GET method.
-const GET = "GET"

controllers/customJavascript.go

@@ -1,13 +0,0 @@
-package controllers
-
-import (
-	"net/http"
-
-	"github.com/owncast/owncast/core/data"
-)
-
-// ServeCustomJavascript will serve optional custom Javascript.
-func ServeCustomJavascript(w http.ResponseWriter, r *http.Request) {
-	js := data.GetCustomJavascript()
-	_, _ = w.Write([]byte(js))
-}

controllers/images.go

@@ -1,62 +0,0 @@
-package controllers
-
-import (
-	"net/http"
-	"path/filepath"
-
-	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/utils"
-)
-
-const (
-	contentTypeJPEG = "image/jpeg"
-	contentTypeGIF  = "image/gif"
-)
-
-// GetThumbnail will return the thumbnail image as a response.
-func GetThumbnail(w http.ResponseWriter, r *http.Request) {
-	imageFilename := "thumbnail.jpg"
-	imagePath := filepath.Join(config.TempDir, imageFilename)
-
-	var imageBytes []byte
-	var err error
-
-	if utils.DoesFileExists(imagePath) {
-		imageBytes, err = getImage(imagePath)
-	} else {
-		GetLogo(w, r)
-		return
-	}
-
-	if err != nil {
-		GetLogo(w, r)
-		return
-	}
-
-	cacheTime := utils.GetCacheDurationSecondsForPath(imagePath)
-	writeBytesAsImage(imageBytes, contentTypeJPEG, w, cacheTime)
-}
-
-// GetPreview will return the preview gif as a response.
-func GetPreview(w http.ResponseWriter, r *http.Request) {
-	imageFilename := "preview.gif"
-	imagePath := filepath.Join(config.TempDir, imageFilename)
-
-	var imageBytes []byte
-	var err error
-
-	if utils.DoesFileExists(imagePath) {
-		imageBytes, err = getImage(imagePath)
-	} else {
-		GetLogo(w, r)
-		return
-	}
-
-	if err != nil {
-		GetLogo(w, r)
-		return
-	}
-
-	cacheTime := utils.GetCacheDurationSecondsForPath(imagePath)
-	writeBytesAsImage(imageBytes, contentTypeGIF, w, cacheTime)
-}

controllers/playbackMetrics.go

@@ -1,52 +0,0 @@
-package controllers
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"github.com/owncast/owncast/metrics"
-	"github.com/owncast/owncast/utils"
-	log "github.com/sirupsen/logrus"
-)
-
-// ReportPlaybackMetrics will accept playback metrics from a client and save
-// them for future video health reporting.
-func ReportPlaybackMetrics(w http.ResponseWriter, r *http.Request) {
-	if r.Method != POST {
-		WriteSimpleResponse(w, false, r.Method+" not supported")
-		return
-	}
-
-	type reportPlaybackMetricsRequest struct {
-		Bandwidth             float64 `json:"bandwidth"`
-		Latency               float64 `json:"latency"`
-		Errors                float64 `json:"errors"`
-		DownloadDuration      float64 `json:"downloadDuration"`
-		QualityVariantChanges float64 `json:"qualityVariantChanges"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var request reportPlaybackMetricsRequest
-	if err := decoder.Decode(&request); err != nil {
-		log.Errorln("error decoding playback metrics payload:", err)
-		WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	clientID := utils.GenerateClientIDFromRequest(r)
-
-	metrics.RegisterPlaybackErrorCount(clientID, request.Errors)
-	if request.Bandwidth != 0.0 {
-		metrics.RegisterPlayerBandwidth(clientID, request.Bandwidth)
-	}
-
-	if request.Latency != 0.0 {
-		metrics.RegisterPlayerLatency(clientID, request.Latency)
-	}
-
-	if request.DownloadDuration != 0.0 {
-		metrics.RegisterPlayerSegmentDownloadDuration(clientID, request.DownloadDuration)
-	}
-
-	metrics.RegisterQualityVariantChangesCount(clientID, request.QualityVariantChanges)
-}

core/cache/cache.go

@@ -0,0 +1,82 @@
+package cache
+
+import (
+	"time"
+
+	"github.com/jellydator/ttlcache/v3"
+)
+
+// CacheContainer is a container for all caches.
+type CacheContainer struct {
+	caches map[string]*CacheInstance
+}
+
+// CacheInstance is a single cache instance.
+type CacheInstance struct {
+	cache *ttlcache.Cache[string, []byte]
+}
+
+// This is the global singleton instance. (To be removed after refactor).
+var _instance *CacheContainer
+
+// NewCache creates a new cache instance.
+func NewGlobalCache() *CacheContainer {
+	_instance = &CacheContainer{
+		caches: make(map[string]*CacheInstance),
+	}
+
+	return _instance
+}
+
+// GetCache returns the cache instance.
+func GetGlobalCache() *CacheContainer {
+	if _instance != nil {
+		return _instance
+	}
+	return NewGlobalCache()
+}
+
+// GetOrCreateCache returns the cache instance or creates a new one.
+func (c *CacheContainer) GetOrCreateCache(name string, expiration time.Duration) *CacheInstance {
+	if _, ok := c.caches[name]; !ok {
+		c.CreateCache(name, expiration)
+	}
+	return c.caches[name]
+}
+
+// CreateCache creates a new cache instance.
+func (c *CacheContainer) CreateCache(name string, expiration time.Duration) *CacheInstance {
+	cache := ttlcache.New[string, []byte](
+		ttlcache.WithTTL[string, []byte](expiration),
+		ttlcache.WithDisableTouchOnHit[string, []byte](),
+	)
+	ci := &CacheInstance{cache: cache}
+	c.caches[name] = ci
+	go cache.Start()
+	return ci
+}
+
+// GetCache returns the cache instance.
+func (c *CacheContainer) GetCache(name string) *CacheInstance {
+	return c.caches[name]
+}
+
+// GetValueForKey returns the value for the given key.
+func (ci *CacheInstance) GetValueForKey(key string) []byte {
+	value := ci.cache.Get(key, ttlcache.WithDisableTouchOnHit[string, []byte]())
+	if value == nil {
+		return nil
+	}
+
+	if value.IsExpired() {
+		return nil
+	}
+
+	val := value.Value()
+	return val
+}
+
+// Set sets the value for the given key..
+func (ci *CacheInstance) Set(key string, value []byte) {
+	ci.cache.Set(key, value, 0)
+}

core/cache/cache_test.go

@@ -0,0 +1,72 @@
+package cache
+
+import (
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCache(t *testing.T) {
+	expiration := 5 * time.Second
+	globalCache := GetGlobalCache()
+	assert.NotNil(t, globalCache, "NewGlobalCache should return a non-nil instance")
+	assert.Equal(t, globalCache, GetGlobalCache(), "GetGlobalCache should return the created instance")
+
+	cacheName := "testCache"
+	globalCache.CreateCache(cacheName, expiration)
+
+	createdCache := globalCache.GetCache(cacheName)
+	assert.NotNil(t, createdCache, "GetCache should return a non-nil cache")
+
+	key := "testKey"
+	value := []byte("testValue")
+	createdCache.Set(key, value)
+
+	// Wait for cache to expire
+	time.Sleep(expiration + 1*time.Second)
+
+	// Verify that the cache has expired
+	ci := globalCache.GetCache(cacheName)
+	cachedValue := ci.GetValueForKey(key)
+	assert.Nil(t, cachedValue, "Cache should not contain the value after expiration")
+}
+
+func TestConcurrentAccess(t *testing.T) {
+	// Test concurrent access to the cache
+	globalCache := NewGlobalCache()
+	cacheName := "concurrentCache"
+	expiration := 5 * time.Second
+	globalCache.CreateCache(cacheName, expiration)
+
+	// Start multiple goroutines to access the cache concurrently
+	numGoroutines := 10
+	keyPrefix := "key"
+	valuePrefix := "value"
+
+	done := make(chan struct{})
+	for i := 0; i < numGoroutines; i++ {
+		go func(index int) {
+			defer func() { done <- struct{}{} }()
+
+			cache := globalCache.GetCache(cacheName)
+			key := keyPrefix + strconv.Itoa(index)
+			value := valuePrefix + strconv.Itoa(index)
+
+			cache.Set(key, []byte(value))
+
+			// Simulate some work
+			time.Sleep(100 * time.Millisecond)
+
+			ci := globalCache.GetCache(cacheName)
+			cachedValue := string(ci.GetValueForKey(key))
+			assert.Equal(t, value, cachedValue, "Cached value should match the set value")
+		}(i)
+	}
+
+	// Wait for all goroutines to finish
+	for i := 0; i < numGoroutines; i++ {
+		<-done
+	}
+}

core/chat/chat.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/owncast/owncast/config"
 	"github.com/owncast/owncast/core/chat/events"
-	"github.com/owncast/owncast/core/data"
 	"github.com/owncast/owncast/models"
+	"github.com/owncast/owncast/persistence/configrepository"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	log "github.com/sirupsen/logrus"
@@ -23,6 +23,8 @@ var (
 func Start(getStatusFunc func() models.Status) error {
 	setupPersistence()
 
+	configRepository := configrepository.Get()
+
 	getStatus = getStatusFunc
 	_server = NewChat()
 
@@ -35,7 +37,7 @@ func Start(getStatusFunc func() models.Status) error {
 		Help: "The number of chat messages incremented over time.",
 		ConstLabels: map[string]string{
 			"version": config.VersionNumber,
-			"host":    data.GetServerURL(),
+			"host":    configRepository.GetServerURL(),
 		},
 	})
 

core/chat/chatclient.go

@@ -13,19 +13,21 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/owncast/owncast/config"
 	"github.com/owncast/owncast/core/chat/events"
-	"github.com/owncast/owncast/core/user"
-	"github.com/owncast/owncast/geoip"
+	"github.com/owncast/owncast/models"
+	"github.com/owncast/owncast/persistence/configrepository"
+	"github.com/owncast/owncast/services/geoip"
 )
 
 // Client represents a single chat client.
 type Client struct {
-	ConnectedAt  time.Time `json:"connectedAt"`
-	timeoutTimer *time.Timer
-	rateLimiter  *rate.Limiter
-	conn         *websocket.Conn
-	User         *user.User `json:"user"`
-	server       *Server
-	Geo          *geoip.GeoDetails `json:"geo"`
+	ConnectedAt   time.Time `json:"connectedAt"`
+	timeoutTimer  *time.Timer
+	rateLimiter   *rate.Limiter
+	messageFilter *ChatMessageFilter
+	conn          *websocket.Conn
+	User          *models.User `json:"user"`
+	server        *Server
+	Geo           *geoip.GeoDetails `json:"geo"`
 	// Buffered channel of outbound messages.
 	send         chan []byte
 	accessToken  string
@@ -90,6 +92,7 @@ func (c *Client) readPump() {
 	// Allow 3 messages every two seconds.
 	limit := rate.Every(2 * time.Second / 3)
 	c.rateLimiter = rate.NewLimiter(limit, 1)
+	c.messageFilter = NewMessageFilter()
 
 	defer func() {
 		c.close()
@@ -129,6 +132,14 @@ func (c *Client) readPump() {
 			continue
 		}
 
+		// Check if this message passes the optional language filter
+		configRepository := configrepository.Get()
+
+		if configRepository.GetChatSlurFilterEnabled() && !c.messageFilter.Allow(string(message)) {
+			c.sendAction("Sorry, that message contained language that is not allowed in this chat.")
+			continue
+		}
+
 		message = bytes.TrimSpace(bytes.ReplaceAll(message, newline, space))
 		c.handleEvent(message)
 	}
@@ -200,7 +211,15 @@ func (c *Client) close() {
 }
 
 func (c *Client) passesRateLimit() bool {
-	return c.rateLimiter.Allow() && !c.inTimeout
+	configRepository := configrepository.Get()
+
+	// If spam rate limiting is disabled, or the user is a moderator, always
+	// allow the message.
+	if !configRepository.GetChatSpamProtectionEnabled() || c.User.IsModerator() {
+		return true
+	}
+
+	return (c.rateLimiter.Allow() && !c.inTimeout)
 }
 
 func (c *Client) startChatRejectionTimeout() {

core/chat/concurrentConnections.go

@@ -10,14 +10,14 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func setSystemConcurrentConnectionLimit(limit int64) {
+func setSystemConcurrentConnectionLimit(limit uint64) {
 	var rLimit syscall.Rlimit
 	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
 		log.Fatalln(err)
 	}
 
 	originalLimit := rLimit.Cur
-	rLimit.Cur = uint64(limit)
+	rLimit.Cur = limit
 	if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
 		log.Fatalln(err)
 	}

core/chat/concurrentConnections_freebsd.go

@@ -9,7 +9,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func setSystemConcurrentConnectionLimit(limit int64) {
+func setSystemConcurrentConnectionLimit(limit uint64) {
 	var rLimit syscall.Rlimit
 	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
 		log.Fatalln(err)

core/chat/concurrentConnections_windows.go

@@ -3,4 +3,4 @@
 
 package chat
 
-func setSystemConcurrentConnectionLimit(limit int64) {}
+func setSystemConcurrentConnectionLimit(limit uint64) {}

core/chat/events.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/owncast/owncast/config"
 	"github.com/owncast/owncast/core/chat/events"
-	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/core/user"
 	"github.com/owncast/owncast/core/webhooks"
+	"github.com/owncast/owncast/persistence/configrepository"
+	"github.com/owncast/owncast/persistence/userrepository"
 	"github.com/owncast/owncast/utils"
 	log "github.com/sirupsen/logrus"
 )
@@ -22,10 +22,12 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
 		return
 	}
 
+	configRepository := configrepository.Get()
+
 	proposedUsername := receivedEvent.NewName
 
 	// Check if name is on the blocklist
-	blocklist := data.GetForbiddenUsernameList()
+	blocklist := configRepository.GetForbiddenUsernameList()
 
 	// Names have a max length
 	proposedUsername = utils.MakeSafeStringOfLength(proposedUsername, config.MaxChatDisplayNameLength)
@@ -46,12 +48,14 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
 		}
 	}
 
+	userRepository := userrepository.Get()
+
 	// Check if the name is not already assigned to a registered user.
-	if available, err := user.IsDisplayNameAvailable(proposedUsername); err != nil {
+	if available, err := userRepository.IsDisplayNameAvailable(proposedUsername); err != nil {
 		log.Errorln("error checking if name is available", err)
 		return
 	} else if !available {
-		message := fmt.Sprintf("The name **%s** has been already registered. If this is your name, please authenticate.", proposedUsername)
+		message := fmt.Sprintf("The name **%s** has already been registered. If this is your name, please authenticate.", proposedUsername)
 		s.sendActionToClient(eventData.client, message)
 
 		// Resend the client's user so their username is in sync.
@@ -60,7 +64,7 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
 		return
 	}
 
-	savedUser := user.GetUserByToken(eventData.client.accessToken)
+	savedUser := userRepository.GetUserByToken(eventData.client.accessToken)
 	oldName := savedUser.DisplayName
 
 	// Check that the new name is different from old.
@@ -70,7 +74,7 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
 	}
 
 	// Save the new name
-	if err := user.ChangeUsername(eventData.client.User.ID, proposedUsername); err != nil {
+	if err := userRepository.ChangeUsername(eventData.client.User.ID, proposedUsername); err != nil {
 		log.Errorln("error changing username", err)
 	}
 
@@ -103,6 +107,8 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
 }
 
 func (s *Server) userColorChanged(eventData chatClientEvent) {
+	userRepository := userrepository.Get()
+
 	var receivedEvent events.ColorChangeEvent
 	if err := json.Unmarshal(eventData.data, &receivedEvent); err != nil {
 		log.Errorln("error unmarshalling to ColorChangeEvent", err)
@@ -116,7 +122,7 @@ func (s *Server) userColorChanged(eventData chatClientEvent) {
 	}
 
 	// Save the new color
-	if err := user.ChangeUserColor(eventData.client.User.ID, receivedEvent.NewColor); err != nil {
+	if err := userRepository.ChangeUserColor(eventData.client.User.ID, receivedEvent.NewColor); err != nil {
 		log.Errorln("error changing user display color", err)
 	}
 
@@ -126,6 +132,8 @@ func (s *Server) userColorChanged(eventData chatClientEvent) {
 }
 
 func (s *Server) userMessageSent(eventData chatClientEvent) {
+	userRepository := userrepository.Get()
+
 	var event events.UserMessageEvent
 	if err := json.Unmarshal(eventData.data, &event); err != nil {
 		log.Errorln("error unmarshalling to UserMessageEvent", err)
@@ -148,7 +156,7 @@ func (s *Server) userMessageSent(eventData chatClientEvent) {
 		}
 	}
 
-	event.User = user.GetUserByToken(eventData.client.accessToken)
+	event.User = userRepository.GetUserByToken(eventData.client.accessToken)
 
 	// Guard against nil users
 	if event.User == nil {

core/chat/events/connectedClientInfo.go

@@ -1,9 +1,9 @@
 package events
 
-import "github.com/owncast/owncast/core/user"
+import "github.com/owncast/owncast/models"
 
 // ConnectedClientInfo represents the information about a connected client.
 type ConnectedClientInfo struct {
-	User *user.User `json:"user"`
+	User *models.User `json:"user"`
 	Event
 }

core/chat/events/events.go

@@ -17,10 +17,10 @@ import (
 	"github.com/yuin/goldmark/extension"
 	"github.com/yuin/goldmark/renderer/html"
 	"github.com/yuin/goldmark/util"
-	"mvdan.cc/xurls"
+	"mvdan.cc/xurls/v2"
 
 	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/core/user"
+	"github.com/owncast/owncast/models"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -30,21 +30,21 @@ type EventPayload map[string]interface{}
 // OutboundEvent represents an event that is sent out to all listeners of the chat server.
 type OutboundEvent interface {
 	GetBroadcastPayload() EventPayload
-	GetMessageType() EventType
+	GetMessageType() models.EventType
 }
 
 // Event is any kind of event.  A type is required to be specified.
 type Event struct {
-	Timestamp time.Time `json:"timestamp"`
-	Type      EventType `json:"type,omitempty"`
-	ID        string    `json:"id"`
+	Timestamp time.Time        `json:"timestamp"`
+	Type      models.EventType `json:"type,omitempty"`
+	ID        string           `json:"id"`
 }
 
 // UserEvent is an event with an associated user.
 type UserEvent struct {
-	User     *user.User `json:"user"`
-	HiddenAt *time.Time `json:"hiddenAt,omitempty"`
-	ClientID uint       `json:"clientId,omitempty"`
+	User     *models.User `json:"user"`
+	HiddenAt *time.Time   `json:"hiddenAt,omitempty"`
+	ClientID uint         `json:"clientId,omitempty"`
 }
 
 // MessageEvent is an event that has a message body.
@@ -220,7 +220,7 @@ func RenderMarkdown(raw string) string {
 					[]byte("https:"),
 				}),
 				extension.WithLinkifyURLRegexp(
-					xurls.Strict,
+					xurls.Strict(),
 				),
 			),
 			emoji.New(

core/chat/events/fediverseEngagementEvent.go

@@ -1,6 +1,8 @@
 package events
 
-import "github.com/owncast/owncast/core/data"
+import (
+	"github.com/owncast/owncast/persistence/configrepository"
+)
 
 // FediverseEngagementEvent is a message displayed in chat on representing an action on the Fediverse.
 type FediverseEngagementEvent struct {
@@ -13,6 +15,8 @@ type FediverseEngagementEvent struct {
 
 // GetBroadcastPayload will return the object to send to all chat users.
 func (e *FediverseEngagementEvent) GetBroadcastPayload() EventPayload {
+	configRepository := configrepository.Get()
+
 	return EventPayload{
 		"id":        e.ID,
 		"timestamp": e.Timestamp,
@@ -22,7 +26,7 @@ func (e *FediverseEngagementEvent) GetBroadcastPayload() EventPayload {
 		"title":     e.UserAccountName,
 		"link":      e.Link,
 		"user": EventPayload{
-			"displayName": data.GetServerName(),
+			"displayName": configRepository.GetServerName(),
 		},
 	}
 }

core/chat/events/systemMessageEvent.go

@@ -1,6 +1,8 @@
 package events
 
-import "github.com/owncast/owncast/core/data"
+import (
+	"github.com/owncast/owncast/persistence/configrepository"
+)
 
 // SystemMessageEvent is a message displayed in chat on behalf of the server.
 type SystemMessageEvent struct {
@@ -10,13 +12,15 @@ type SystemMessageEvent struct {
 
 // GetBroadcastPayload will return the object to send to all chat users.
 func (e *SystemMessageEvent) GetBroadcastPayload() EventPayload {
+	configRepository := configrepository.Get()
+
 	return EventPayload{
 		"id":        e.ID,
 		"timestamp": e.Timestamp,
 		"body":      e.Body,
 		"type":      SystemMessageSent,
 		"user": EventPayload{
-			"displayName": data.GetServerName(),
+			"displayName": configRepository.GetServerName(),
 		},
 	}
 }

core/chat/messageFilter.go

@@ -0,0 +1,18 @@
+package chat
+
+import (
+	goaway "github.com/TwiN/go-away"
+)
+
+// ChatMessageFilter is a allow/deny chat message filter.
+type ChatMessageFilter struct{}
+
+// NewMessageFilter will return an instance of the chat message filter.
+func NewMessageFilter() *ChatMessageFilter {
+	return &ChatMessageFilter{}
+}
+
+// Allow will test if this message should be allowed to be sent.
+func (*ChatMessageFilter) Allow(message string) bool {
+	return !goaway.IsProfane(message)
+}

core/chat/messageFilter_test.go

@@ -0,0 +1,39 @@
+package chat
+
+import (
+	"testing"
+)
+
+func TestFiltering(t *testing.T) {
+	filter := NewMessageFilter()
+
+	filteredTestMessages := []string{
+		"Hello, fucking world!",
+		"Suck my dick",
+		"Eat my ass",
+		"fuck this shit",
+		"@$$h073",
+		"F   u   C  k th1$ $h!t",
+		"u r fag",
+		"fucking sucks",
+	}
+
+	unfilteredTestMessages := []string{
+		"bass fish",
+		"assumptions",
+	}
+
+	for _, m := range filteredTestMessages {
+		result := filter.Allow(m)
+		if result {
+			t.Errorf("%s should be seen as a filtered profane message", m)
+		}
+	}
+
+	for _, m := range unfilteredTestMessages {
+		result := filter.Allow(m)
+		if !result {
+			t.Errorf("%s should not be filtered", m)
+		}
+	}
+}

core/chat/persistence.go

@@ -8,8 +8,10 @@ import (
 
 	"github.com/owncast/owncast/core/chat/events"
 	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/core/user"
 	"github.com/owncast/owncast/models"
+	"github.com/owncast/owncast/persistence/authrepository"
+	"github.com/owncast/owncast/persistence/tables"
+
 	log "github.com/sirupsen/logrus"
 )
 
@@ -22,8 +24,10 @@ const (
 
 func setupPersistence() {
 	_datastore = data.GetDatastore()
-	data.CreateMessagesTable(_datastore.DB)
-	data.CreateBanIPTable(_datastore.DB)
+	tables.CreateMessagesTable(_datastore.DB)
+
+	authRepository := authrepository.Get()
+	authRepository.CreateBanIPTable(_datastore.DB)
 
 	chatDataPruner := time.NewTicker(5 * time.Minute)
 	go func() {
@@ -104,7 +108,7 @@ func makeUserMessageEventFromRowData(row rowData) events.UserMessageEvent {
 	isBot := (row.userType != nil && *row.userType == "API")
 	scopeSlice := strings.Split(scopes, ",")
 
-	u := user.User{
+	u := models.User{
 		ID:              *row.userID,
 		DisplayName:     displayName,
 		DisplayColor:    displayColor,

core/chat/server.go

@@ -13,10 +13,12 @@ import (
 
 	"github.com/owncast/owncast/config"
 	"github.com/owncast/owncast/core/chat/events"
-	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/core/user"
 	"github.com/owncast/owncast/core/webhooks"
-	"github.com/owncast/owncast/geoip"
+	"github.com/owncast/owncast/models"
+	"github.com/owncast/owncast/persistence/authrepository"
+	"github.com/owncast/owncast/persistence/configrepository"
+	"github.com/owncast/owncast/persistence/userrepository"
+	"github.com/owncast/owncast/services/geoip"
 	"github.com/owncast/owncast/utils"
 )
 
@@ -40,7 +42,7 @@ type Server struct {
 	// a map of user IDs and timers that fire for chat part messages.
 	userPartedTimers         map[string]*time.Ticker
 	seq                      uint
-	maxSocketConnectionLimit int64
+	maxSocketConnectionLimit uint64
 
 	mu sync.RWMutex
 }
@@ -82,7 +84,7 @@ func (s *Server) Run() {
 }
 
 // Addclient registers new connection as a User.
-func (s *Server) Addclient(conn *websocket.Conn, user *user.User, accessToken string, userAgent string, ipAddress string) *Client {
+func (s *Server) Addclient(conn *websocket.Conn, user *models.User, accessToken string, userAgent string, ipAddress string) *Client {
 	client := &Client{
 		server:      s,
 		conn:        conn,
@@ -94,7 +96,16 @@ func (s *Server) Addclient(conn *websocket.Conn, user *user.User, accessToken st
 		ConnectedAt: time.Now(),
 	}
 
-	shouldSendJoinedMessages := data.GetChatJoinPartMessagesEnabled()
+	configRepository := configrepository.Get()
+
+	shouldSendJoinedMessages := configRepository.GetChatJoinPartMessagesEnabled()
+
+	// If there are existing clients connected for this user do not send
+	// a user joined message. Do not put this under a mutex, as
+	// GetClientsForUser already has a lock.
+	if existingConnectedClients, _ := GetClientsForUser(user.ID); len(existingConnectedClients) > 0 {
+		shouldSendJoinedMessages = false
+	}
 
 	s.mu.Lock()
 	{
@@ -178,8 +189,10 @@ func (s *Server) sendUserPartedMessage(c *Client) {
 	userPartEvent.User = c.User
 	userPartEvent.ClientID = c.Id
 
+	configRepository := configrepository.Get()
+
 	// If part messages are disabled.
-	if data.GetChatJoinPartMessagesEnabled() {
+	if configRepository.GetChatJoinPartMessagesEnabled() {
 		if err := s.Broadcast(userPartEvent.GetBroadcastPayload()); err != nil {
 			log.Errorln("error sending chat part message", err)
 		}
@@ -190,14 +203,17 @@ func (s *Server) sendUserPartedMessage(c *Client) {
 
 // HandleClientConnection is fired when a single client connects to the websocket.
 func (s *Server) HandleClientConnection(w http.ResponseWriter, r *http.Request) {
-	if data.GetChatDisabled() {
+	configRepository := configrepository.Get()
+	authRepository := authrepository.Get()
+
+	if configRepository.GetChatDisabled() {
 		_, _ = w.Write([]byte(events.ChatDisabled))
 		return
 	}
 
 	ipAddress := utils.GetIPAddressFromRequest(r)
 	// Check if this client's IP address is banned. If so send a rejection.
-	if blocked, err := data.IsIPAddressBanned(ipAddress); blocked {
+	if blocked, err := authRepository.IsIPAddressBanned(ipAddress); blocked {
 		log.Debugln("Client ip address has been blocked. Rejecting.")
 
 		w.WriteHeader(http.StatusForbidden)
@@ -207,7 +223,7 @@ func (s *Server) HandleClientConnection(w http.ResponseWriter, r *http.Request)
 	}
 
 	// Limit concurrent chat connections
-	if int64(len(s.clients)) >= s.maxSocketConnectionLimit {
+	if uint64(len(s.clients)) >= s.maxSocketConnectionLimit {
 		log.Warnln("rejecting incoming client connection as it exceeds the max client count of", s.maxSocketConnectionLimit)
 		_, _ = w.Write([]byte(events.ErrorMaxConnectionsExceeded))
 		return
@@ -232,8 +248,11 @@ func (s *Server) HandleClientConnection(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
+	userRepository := userrepository.Get()
+
 	// A user is required to use the websocket
-	user := user.GetUserByToken(accessToken)
+	user := userRepository.GetUserByToken(accessToken)
+
 	if user == nil {
 		// Send error that registration is required
 		_ = conn.WriteJSON(events.EventPayload{
@@ -328,8 +347,10 @@ func SendConnectedClientInfoToUser(userID string) error {
 		return err
 	}
 
+	userRepository := userrepository.Get()
+
 	// Get an updated reference to the user.
-	user := user.GetUserByID(userID)
+	user := userRepository.GetUserByID(userID)
 	if user == nil {
 		return fmt.Errorf("user not found")
 	}
@@ -364,12 +385,14 @@ func SendActionToUser(userID string, text string) error {
 }
 
 func (s *Server) eventReceived(event chatClientEvent) {
+	configRepository := configrepository.Get()
+
 	c := event.client
 	u := c.User
 
 	// If established chat user only mode is enabled and the user is not old
 	// enough then reject this event and send them an informative message.
-	if u != nil && data.GetChatEstbalishedUsersOnlyMode() && time.Since(event.client.User.CreatedAt) < config.GetDefaults().ChatEstablishedUserModeTimeDuration && !u.IsModerator() {
+	if u != nil && configRepository.GetChatEstbalishedUsersOnlyMode() && time.Since(event.client.User.CreatedAt) < config.GetDefaults().ChatEstablishedUserModeTimeDuration && !u.IsModerator() {
 		s.sendActionToClient(c, "You have not been an established chat participant long enough to take part in chat. Please enjoy the stream and try again later.")
 		return
 	}
@@ -396,10 +419,12 @@ func (s *Server) eventReceived(event chatClientEvent) {
 }
 
 func (s *Server) sendWelcomeMessageToClient(c *Client) {
+	configRepository := configrepository.Get()
+
 	// Add an artificial delay so people notice this message come in.
 	time.Sleep(7 * time.Second)
 
-	welcomeMessage := utils.RenderSimpleMarkdown(data.GetServerWelcomeMessage())
+	welcomeMessage := utils.RenderSimpleMarkdown(configRepository.GetServerWelcomeMessage())
 
 	if welcomeMessage != "" {
 		s.sendSystemMessageToClient(c, welcomeMessage)
@@ -407,7 +432,9 @@ func (s *Server) sendWelcomeMessageToClient(c *Client) {
 }
 
 func (s *Server) sendAllWelcomeMessage() {
-	welcomeMessage := utils.RenderSimpleMarkdown(data.GetServerWelcomeMessage())
+	configRepository := configrepository.Get()
+
+	welcomeMessage := utils.RenderSimpleMarkdown(configRepository.GetServerWelcomeMessage())
 
 	if welcomeMessage != "" {
 		clientMessage := events.SystemMessageEvent{

core/chat/utils.go

@@ -9,14 +9,14 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func getMaximumConcurrentConnectionLimit() int64 {
+func getMaximumConcurrentConnectionLimit() uint64 {
 	var rLimit syscall.Rlimit
 	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
 		log.Fatalln(err)
 	}
 
 	// Return the limit to 70% of max so the machine doesn't die even if it's maxed out for some reason.
-	proposedLimit := int64(float32(rLimit.Max) * 0.7)
+	proposedLimit := uint64(float32(rLimit.Max) * 0.7)
 
 	return proposedLimit
 }

core/chat/utils_windows.go

@@ -3,7 +3,7 @@
 
 package chat
 
-func getMaximumConcurrentConnectionLimit() int64 {
+func getMaximumConcurrentConnectionLimit() uint64 {
 	// The maximum limit I can find for windows is 16,777,216
 	// (essentially unlimited, but add the 0.7 multiplier as well to be
 	// consistent with other systems)

core/core.go

@@ -13,10 +13,11 @@ import (
 	"github.com/owncast/owncast/core/data"
 	"github.com/owncast/owncast/core/rtmp"
 	"github.com/owncast/owncast/core/transcoder"
-	"github.com/owncast/owncast/core/user"
 	"github.com/owncast/owncast/core/webhooks"
 	"github.com/owncast/owncast/models"
 	"github.com/owncast/owncast/notifications"
+	"github.com/owncast/owncast/persistence/configrepository"
+	"github.com/owncast/owncast/persistence/tables"
 	"github.com/owncast/owncast/utils"
 	"github.com/owncast/owncast/yp"
 )
@@ -34,10 +35,10 @@ var (
 // Start starts up the core processing.
 func Start() error {
 	resetDirectories()
+	configRepository := configrepository.Get()
+	// configRepository.PopulateDefaults()
 
-	data.PopulateDefaults()
-
-	if err := data.VerifySettings(); err != nil {
+	if err := configRepository.VerifySettings(); err != nil {
 		log.Error(err)
 		return err
 	}
@@ -56,7 +57,7 @@ func Start() error {
 		log.Errorln("storage error", err)
 	}
 
-	user.SetupUsers()
+	tables.SetupUsers(data.GetDatastore().DB)
 	auth.Setup(data.GetDatastore())
 
 	fileWriter.SetupFileWriterReceiverService(&handler)
@@ -75,7 +76,7 @@ func Start() error {
 	// start the rtmp server
 	go rtmp.Start(setStreamAsConnected, setBroadcaster)
 
-	rtmpPort := data.GetRTMPPortNumber()
+	rtmpPort := configRepository.GetRTMPPortNumber()
 	if rtmpPort != 1935 {
 		log.Infof("RTMP is accepting inbound streams on port %d.", rtmpPort)
 	}
@@ -104,7 +105,7 @@ func transitionToOfflineVideoStreamContent() {
 	_transcoder.SetLatencyLevel(models.GetLatencyLevel(4))
 	_transcoder.SetIsEvent(true)
 
-	offlineFilePath, err := saveOfflineClipToDisk("offline.ts")
+	offlineFilePath, err := saveOfflineClipToDisk("offline-v2.ts")
 	if err != nil {
 		log.Fatalln("unable to save offline clip:", err)
 	}
@@ -113,7 +114,8 @@ func transitionToOfflineVideoStreamContent() {
 	go _transcoder.Start(false)
 
 	// Copy the logo to be the thumbnail
-	logo := data.GetLogoPath()
+	configRepository := configrepository.Get()
+	logo := configRepository.GetLogoPath()
 	dst := filepath.Join(config.TempDir, "thumbnail.jpg")
 	if err = utils.Copy(filepath.Join("data", logo), dst); err != nil {
 		log.Warnln(err)
@@ -130,7 +132,8 @@ func resetDirectories() {
 	utils.CleanupDirectory(config.HLSStoragePath)
 
 	// Remove the previous thumbnail
-	logo := data.GetLogoPath()
+	configRepository := configrepository.Get()
+	logo := configRepository.GetLogoPath()
 	if utils.DoesFileExists(logo) {
 		err := utils.Copy(path.Join("data", logo), filepath.Join(config.DataDirectory, "thumbnail.jpg"))
 		if err != nil {

core/data/activitypub.go

@@ -1,13 +0,0 @@
-package data
-
-// GetFederatedInboxMap is a mapping between account names and their outbox.
-func GetFederatedInboxMap() map[string]string {
-	return map[string]string{
-		GetDefaultFederationUsername(): GetDefaultFederationUsername(),
-	}
-}
-
-// GetDefaultFederationUsername will return the username used for sending federation activities.
-func GetDefaultFederationUsername() string {
-	return GetFederationUsername()
-}

core/data/config.go

@@ -1,990 +0,0 @@
-package data
-
-import (
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/models"
-	"github.com/owncast/owncast/static"
-	"github.com/owncast/owncast/utils"
-	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
-)
-
-const (
-	extraContentKey                 = "extra_page_content"
-	streamTitleKey                  = "stream_title"
-	adminPasswordKey                = "admin_password_key"
-	logoPathKey                     = "logo_path"
-	logoUniquenessKey               = "logo_uniqueness"
-	serverSummaryKey                = "server_summary"
-	serverWelcomeMessageKey         = "server_welcome_message"
-	serverNameKey                   = "server_name"
-	serverURLKey                    = "server_url"
-	httpPortNumberKey               = "http_port_number"
-	httpListenAddressKey            = "http_listen_address"
-	websocketHostOverrideKey        = "websocket_host_override"
-	rtmpPortNumberKey               = "rtmp_port_number"
-	serverMetadataTagsKey           = "server_metadata_tags"
-	directoryEnabledKey             = "directory_enabled"
-	directoryRegistrationKeyKey     = "directory_registration_key"
-	socialHandlesKey                = "social_handles"
-	peakViewersSessionKey           = "peak_viewers_session"
-	peakViewersOverallKey           = "peak_viewers_overall"
-	lastDisconnectTimeKey           = "last_disconnect_time"
-	ffmpegPathKey                   = "ffmpeg_path"
-	nsfwKey                         = "nsfw"
-	s3StorageConfigKey              = "s3_storage_config"
-	videoLatencyLevel               = "video_latency_level"
-	videoStreamOutputVariantsKey    = "video_stream_output_variants"
-	chatDisabledKey                 = "chat_disabled"
-	externalActionsKey              = "external_actions"
-	customStylesKey                 = "custom_styles"
-	customJavascriptKey             = "custom_javascript"
-	videoCodecKey                   = "video_codec"
-	blockedUsernamesKey             = "blocked_usernames"
-	publicKeyKey                    = "public_key"
-	privateKeyKey                   = "private_key"
-	serverInitDateKey               = "server_init_date"
-	federationEnabledKey            = "federation_enabled"
-	federationUsernameKey           = "federation_username"
-	federationPrivateKey            = "federation_private"
-	federationGoLiveMessageKey      = "federation_go_live_message"
-	federationShowEngagementKey     = "federation_show_engagement"
-	federationBlockedDomainsKey     = "federation_blocked_domains"
-	suggestedUsernamesKey           = "suggested_usernames"
-	chatJoinMessagesEnabledKey      = "chat_join_messages_enabled"
-	chatEstablishedUsersOnlyModeKey = "chat_established_users_only_mode"
-	notificationsEnabledKey         = "notifications_enabled"
-	discordConfigurationKey         = "discord_configuration"
-	browserPushConfigurationKey     = "browser_push_configuration"
-	browserPushPublicKeyKey         = "browser_push_public_key"
-	// nolint:gosec
-	browserPushPrivateKeyKey             = "browser_push_private_key"
-	hasConfiguredInitialNotificationsKey = "has_configured_initial_notifications"
-	hideViewerCountKey                   = "hide_viewer_count"
-	customOfflineMessageKey              = "custom_offline_message"
-	customColorVariableValuesKey         = "custom_color_variable_values"
-	streamKeysKey                        = "stream_keys"
-	disableSearchIndexingKey             = "disable_search_indexing"
-	videoServingEndpointKey              = "video_serving_endpoint"
-)
-
-// GetExtraPageBodyContent will return the user-supplied body content.
-func GetExtraPageBodyContent() string {
-	content, err := _datastore.GetString(extraContentKey)
-	if err != nil {
-		log.Traceln(extraContentKey, err)
-		return config.GetDefaults().PageBodyContent
-	}
-
-	return content
-}
-
-// SetExtraPageBodyContent will set the user-supplied body content.
-func SetExtraPageBodyContent(content string) error {
-	return _datastore.SetString(extraContentKey, content)
-}
-
-// GetStreamTitle will return the name of the current stream.
-func GetStreamTitle() string {
-	title, err := _datastore.GetString(streamTitleKey)
-	if err != nil {
-		return ""
-	}
-
-	return title
-}
-
-// SetStreamTitle will set the name of the current stream.
-func SetStreamTitle(title string) error {
-	return _datastore.SetString(streamTitleKey, title)
-}
-
-// GetAdminPassword will return the admin password.
-func GetAdminPassword() string {
-	key, _ := _datastore.GetString(adminPasswordKey)
-	return key
-}
-
-// SetAdminPassword will set the admin password.
-func SetAdminPassword(key string) error {
-	return _datastore.SetString(adminPasswordKey, key)
-}
-
-// GetLogoPath will return the path for the logo, relative to webroot.
-func GetLogoPath() string {
-	logo, err := _datastore.GetString(logoPathKey)
-	if err != nil {
-		log.Traceln(logoPathKey, err)
-		return config.GetDefaults().Logo
-	}
-
-	if logo == "" {
-		return config.GetDefaults().Logo
-	}
-
-	return logo
-}
-
-// SetLogoPath will set the path for the logo, relative to webroot.
-func SetLogoPath(logo string) error {
-	return _datastore.SetString(logoPathKey, logo)
-}
-
-// SetLogoUniquenessString will set the logo cache busting string.
-func SetLogoUniquenessString(uniqueness string) error {
-	return _datastore.SetString(logoUniquenessKey, uniqueness)
-}
-
-// GetLogoUniquenessString will return the logo cache busting string.
-func GetLogoUniquenessString() string {
-	uniqueness, err := _datastore.GetString(logoUniquenessKey)
-	if err != nil {
-		log.Traceln(logoUniquenessKey, err)
-		return ""
-	}
-
-	return uniqueness
-}
-
-// GetServerSummary will return the server summary text.
-func GetServerSummary() string {
-	summary, err := _datastore.GetString(serverSummaryKey)
-	if err != nil {
-		log.Traceln(serverSummaryKey, err)
-		return ""
-	}
-
-	return summary
-}
-
-// SetServerSummary will set the server summary text.
-func SetServerSummary(summary string) error {
-	return _datastore.SetString(serverSummaryKey, summary)
-}
-
-// GetServerWelcomeMessage will return the server welcome message text.
-func GetServerWelcomeMessage() string {
-	welcomeMessage, err := _datastore.GetString(serverWelcomeMessageKey)
-	if err != nil {
-		log.Traceln(serverWelcomeMessageKey, err)
-		return config.GetDefaults().ServerWelcomeMessage
-	}
-
-	return welcomeMessage
-}
-
-// SetServerWelcomeMessage will set the server welcome message text.
-func SetServerWelcomeMessage(welcomeMessage string) error {
-	return _datastore.SetString(serverWelcomeMessageKey, welcomeMessage)
-}
-
-// GetServerName will return the server name text.
-func GetServerName() string {
-	name, err := _datastore.GetString(serverNameKey)
-	if err != nil {
-		log.Traceln(serverNameKey, err)
-		return config.GetDefaults().Name
-	}
-
-	return name
-}
-
-// SetServerName will set the server name text.
-func SetServerName(name string) error {
-	return _datastore.SetString(serverNameKey, name)
-}
-
-// GetServerURL will return the server URL.
-func GetServerURL() string {
-	url, err := _datastore.GetString(serverURLKey)
-	if err != nil {
-		return ""
-	}
-
-	return url
-}
-
-// SetServerURL will set the server URL.
-func SetServerURL(url string) error {
-	return _datastore.SetString(serverURLKey, url)
-}
-
-// GetHTTPPortNumber will return the server HTTP port.
-func GetHTTPPortNumber() int {
-	port, err := _datastore.GetNumber(httpPortNumberKey)
-	if err != nil {
-		log.Traceln(httpPortNumberKey, err)
-		return config.GetDefaults().WebServerPort
-	}
-
-	if port == 0 {
-		return config.GetDefaults().WebServerPort
-	}
-	return int(port)
-}
-
-// SetWebsocketOverrideHost will set the host override for websockets.
-func SetWebsocketOverrideHost(host string) error {
-	return _datastore.SetString(websocketHostOverrideKey, host)
-}
-
-// GetWebsocketOverrideHost will return the host override for websockets.
-func GetWebsocketOverrideHost() string {
-	host, _ := _datastore.GetString(websocketHostOverrideKey)
-
-	return host
-}
-
-// SetHTTPPortNumber will set the server HTTP port.
-func SetHTTPPortNumber(port float64) error {
-	return _datastore.SetNumber(httpPortNumberKey, port)
-}
-
-// GetHTTPListenAddress will return the HTTP listen address.
-func GetHTTPListenAddress() string {
-	address, err := _datastore.GetString(httpListenAddressKey)
-	if err != nil {
-		log.Traceln(httpListenAddressKey, err)
-		return config.GetDefaults().WebServerIP
-	}
-	return address
-}
-
-// SetHTTPListenAddress will set the server HTTP listen address.
-func SetHTTPListenAddress(address string) error {
-	return _datastore.SetString(httpListenAddressKey, address)
-}
-
-// GetRTMPPortNumber will return the server RTMP port.
-func GetRTMPPortNumber() int {
-	port, err := _datastore.GetNumber(rtmpPortNumberKey)
-	if err != nil {
-		log.Traceln(rtmpPortNumberKey, err)
-		return config.GetDefaults().RTMPServerPort
-	}
-
-	if port == 0 {
-		return config.GetDefaults().RTMPServerPort
-	}
-
-	return int(port)
-}
-
-// SetRTMPPortNumber will set the server RTMP port.
-func SetRTMPPortNumber(port float64) error {
-	return _datastore.SetNumber(rtmpPortNumberKey, port)
-}
-
-// GetServerMetadataTags will return the metadata tags.
-func GetServerMetadataTags() []string {
-	tagsString, err := _datastore.GetString(serverMetadataTagsKey)
-	if tagsString == "" {
-		return []string{}
-	}
-
-	if err != nil {
-		log.Traceln(serverMetadataTagsKey, err)
-		return []string{}
-	}
-
-	return strings.Split(tagsString, ",")
-}
-
-// SetServerMetadataTags will return the metadata tags.
-func SetServerMetadataTags(tags []string) error {
-	tagString := strings.Join(tags, ",")
-	return _datastore.SetString(serverMetadataTagsKey, tagString)
-}
-
-// GetDirectoryEnabled will return if this server should register to YP.
-func GetDirectoryEnabled() bool {
-	enabled, err := _datastore.GetBool(directoryEnabledKey)
-	if err != nil {
-		return config.GetDefaults().YPEnabled
-	}
-
-	return enabled
-}
-
-// SetDirectoryEnabled will set if this server should register to YP.
-func SetDirectoryEnabled(enabled bool) error {
-	return _datastore.SetBool(directoryEnabledKey, enabled)
-}
-
-// SetDirectoryRegistrationKey will set the YP protocol registration key.
-func SetDirectoryRegistrationKey(key string) error {
-	return _datastore.SetString(directoryRegistrationKeyKey, key)
-}
-
-// GetDirectoryRegistrationKey will return the YP protocol registration key.
-func GetDirectoryRegistrationKey() string {
-	key, _ := _datastore.GetString(directoryRegistrationKeyKey)
-	return key
-}
-
-// GetSocialHandles will return the external social links.
-func GetSocialHandles() []models.SocialHandle {
-	var socialHandles []models.SocialHandle
-
-	configEntry, err := _datastore.Get(socialHandlesKey)
-	if err != nil {
-		log.Traceln(socialHandlesKey, err)
-		return socialHandles
-	}
-
-	if err := configEntry.getObject(&socialHandles); err != nil {
-		log.Traceln(err)
-		return socialHandles
-	}
-
-	return socialHandles
-}
-
-// SetSocialHandles will set the external social links.
-func SetSocialHandles(socialHandles []models.SocialHandle) error {
-	configEntry := ConfigEntry{Key: socialHandlesKey, Value: socialHandles}
-	return _datastore.Save(configEntry)
-}
-
-// GetPeakSessionViewerCount will return the max number of viewers for this stream.
-func GetPeakSessionViewerCount() int {
-	count, err := _datastore.GetNumber(peakViewersSessionKey)
-	if err != nil {
-		return 0
-	}
-	return int(count)
-}
-
-// SetPeakSessionViewerCount will set the max number of viewers for this stream.
-func SetPeakSessionViewerCount(count int) error {
-	return _datastore.SetNumber(peakViewersSessionKey, float64(count))
-}
-
-// GetPeakOverallViewerCount will return the overall max number of viewers.
-func GetPeakOverallViewerCount() int {
-	count, err := _datastore.GetNumber(peakViewersOverallKey)
-	if err != nil {
-		return 0
-	}
-	return int(count)
-}
-
-// SetPeakOverallViewerCount will set the overall max number of viewers.
-func SetPeakOverallViewerCount(count int) error {
-	return _datastore.SetNumber(peakViewersOverallKey, float64(count))
-}
-
-// GetLastDisconnectTime will return the time the last stream ended.
-func GetLastDisconnectTime() (*utils.NullTime, error) {
-	var disconnectTime utils.NullTime
-
-	configEntry, err := _datastore.Get(lastDisconnectTimeKey)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := configEntry.getObject(&disconnectTime); err != nil {
-		return nil, err
-	}
-
-	if !disconnectTime.Valid || disconnectTime.Time.IsZero() {
-		return nil, err
-	}
-
-	return &disconnectTime, nil
-}
-
-// SetLastDisconnectTime will set the time the last stream ended.
-func SetLastDisconnectTime(disconnectTime time.Time) error {
-	savedDisconnectTime := utils.NullTime{Time: disconnectTime, Valid: true}
-	configEntry := ConfigEntry{Key: lastDisconnectTimeKey, Value: savedDisconnectTime}
-	return _datastore.Save(configEntry)
-}
-
-// SetNSFW will set if this stream has NSFW content.
-func SetNSFW(isNSFW bool) error {
-	return _datastore.SetBool(nsfwKey, isNSFW)
-}
-
-// GetNSFW will return if this stream has NSFW content.
-func GetNSFW() bool {
-	nsfw, err := _datastore.GetBool(nsfwKey)
-	if err != nil {
-		return false
-	}
-	return nsfw
-}
-
-// SetFfmpegPath will set the custom ffmpeg path.
-func SetFfmpegPath(path string) error {
-	return _datastore.SetString(ffmpegPathKey, path)
-}
-
-// GetFfMpegPath will return the ffmpeg path.
-func GetFfMpegPath() string {
-	path, err := _datastore.GetString(ffmpegPathKey)
-	if err != nil {
-		return ""
-	}
-	return path
-}
-
-// GetS3Config will return the external storage configuration.
-func GetS3Config() models.S3 {
-	configEntry, err := _datastore.Get(s3StorageConfigKey)
-	if err != nil {
-		return models.S3{Enabled: false}
-	}
-
-	var s3Config models.S3
-	if err := configEntry.getObject(&s3Config); err != nil {
-		return models.S3{Enabled: false}
-	}
-
-	return s3Config
-}
-
-// SetS3Config will set the external storage configuration.
-func SetS3Config(config models.S3) error {
-	configEntry := ConfigEntry{Key: s3StorageConfigKey, Value: config}
-	return _datastore.Save(configEntry)
-}
-
-// GetStreamLatencyLevel will return the stream latency level.
-func GetStreamLatencyLevel() models.LatencyLevel {
-	level, err := _datastore.GetNumber(videoLatencyLevel)
-	if err != nil {
-		level = 2 // default
-	} else if level > 4 {
-		level = 4 // highest
-	}
-
-	return models.GetLatencyLevel(int(level))
-}
-
-// SetStreamLatencyLevel will set the stream latency level.
-func SetStreamLatencyLevel(level float64) error {
-	return _datastore.SetNumber(videoLatencyLevel, level)
-}
-
-// GetStreamOutputVariants will return all of the stream output variants.
-func GetStreamOutputVariants() []models.StreamOutputVariant {
-	configEntry, err := _datastore.Get(videoStreamOutputVariantsKey)
-	if err != nil {
-		return config.GetDefaults().StreamVariants
-	}
-
-	var streamOutputVariants []models.StreamOutputVariant
-	if err := configEntry.getObject(&streamOutputVariants); err != nil {
-		return config.GetDefaults().StreamVariants
-	}
-
-	if len(streamOutputVariants) == 0 {
-		return config.GetDefaults().StreamVariants
-	}
-
-	return streamOutputVariants
-}
-
-// SetStreamOutputVariants will set the stream output variants.
-func SetStreamOutputVariants(variants []models.StreamOutputVariant) error {
-	configEntry := ConfigEntry{Key: videoStreamOutputVariantsKey, Value: variants}
-	return _datastore.Save(configEntry)
-}
-
-// SetChatDisabled will disable chat if set to true.
-func SetChatDisabled(disabled bool) error {
-	return _datastore.SetBool(chatDisabledKey, disabled)
-}
-
-// GetChatDisabled will return if chat is disabled.
-func GetChatDisabled() bool {
-	disabled, err := _datastore.GetBool(chatDisabledKey)
-	if err == nil {
-		return disabled
-	}
-
-	return false
-}
-
-// SetChatEstablishedUsersOnlyMode sets the state of established user only mode.
-func SetChatEstablishedUsersOnlyMode(enabled bool) error {
-	return _datastore.SetBool(chatEstablishedUsersOnlyModeKey, enabled)
-}
-
-// GetChatEstbalishedUsersOnlyMode returns the state of established user only mode.
-func GetChatEstbalishedUsersOnlyMode() bool {
-	enabled, err := _datastore.GetBool(chatEstablishedUsersOnlyModeKey)
-	if err == nil {
-		return enabled
-	}
-
-	return false
-}
-
-// GetExternalActions will return the registered external actions.
-func GetExternalActions() []models.ExternalAction {
-	configEntry, err := _datastore.Get(externalActionsKey)
-	if err != nil {
-		return []models.ExternalAction{}
-	}
-
-	var externalActions []models.ExternalAction
-	if err := configEntry.getObject(&externalActions); err != nil {
-		return []models.ExternalAction{}
-	}
-
-	return externalActions
-}
-
-// SetExternalActions will save external actions.
-func SetExternalActions(actions []models.ExternalAction) error {
-	configEntry := ConfigEntry{Key: externalActionsKey, Value: actions}
-	return _datastore.Save(configEntry)
-}
-
-// SetCustomStyles will save a string with CSS to insert into the page.
-func SetCustomStyles(styles string) error {
-	return _datastore.SetString(customStylesKey, styles)
-}
-
-// GetCustomStyles will return a string with CSS to insert into the page.
-func GetCustomStyles() string {
-	style, err := _datastore.GetString(customStylesKey)
-	if err != nil {
-		return ""
-	}
-
-	return style
-}
-
-// SetCustomJavascript will save a string with Javascript to insert into the page.
-func SetCustomJavascript(styles string) error {
-	return _datastore.SetString(customJavascriptKey, styles)
-}
-
-// GetCustomJavascript will return a string with Javascript to insert into the page.
-func GetCustomJavascript() string {
-	style, err := _datastore.GetString(customJavascriptKey)
-	if err != nil {
-		return ""
-	}
-
-	return style
-}
-
-// SetVideoCodec will set the codec used for video encoding.
-func SetVideoCodec(codec string) error {
-	return _datastore.SetString(videoCodecKey, codec)
-}
-
-// GetVideoCodec returns the codec to use for transcoding video.
-func GetVideoCodec() string {
-	codec, err := _datastore.GetString(videoCodecKey)
-	if codec == "" || err != nil {
-		return "libx264" // Default value
-	}
-
-	return codec
-}
-
-// VerifySettings will perform a sanity check for specific settings values.
-func VerifySettings() error {
-	if len(GetStreamKeys()) == 0 && config.TemporaryStreamKey == "" {
-		log.Errorln("No stream key set. Streaming is disabled. Please set one via the admin or command line arguments")
-	}
-
-	if GetAdminPassword() == "" {
-		return errors.New("no admin password set. Please set one via the admin or command line arguments")
-	}
-
-	logoPath := GetLogoPath()
-	if !utils.DoesFileExists(filepath.Join(config.DataDirectory, logoPath)) {
-		log.Traceln(logoPath, "not found in the data directory. copying a default logo.")
-		logo := static.GetLogo()
-		if err := os.WriteFile(filepath.Join(config.DataDirectory, "logo.png"), logo, 0o600); err != nil {
-			return errors.Wrap(err, "failed to write logo to disk")
-		}
-		if err := SetLogoPath("logo.png"); err != nil {
-			return errors.Wrap(err, "failed to save logo filename")
-		}
-	}
-
-	return nil
-}
-
-// FindHighestVideoQualityIndex will return the highest quality from a slice of variants.
-func FindHighestVideoQualityIndex(qualities []models.StreamOutputVariant) int {
-	type IndexedQuality struct {
-		quality models.StreamOutputVariant
-		index   int
-	}
-
-	if len(qualities) < 2 {
-		return 0
-	}
-
-	indexedQualities := make([]IndexedQuality, 0)
-	for index, quality := range qualities {
-		indexedQuality := IndexedQuality{quality, index}
-		indexedQualities = append(indexedQualities, indexedQuality)
-	}
-
-	sort.Slice(indexedQualities, func(a, b int) bool {
-		if indexedQualities[a].quality.IsVideoPassthrough && !indexedQualities[b].quality.IsVideoPassthrough {
-			return true
-		}
-
-		if !indexedQualities[a].quality.IsVideoPassthrough && indexedQualities[b].quality.IsVideoPassthrough {
-			return false
-		}
-
-		return indexedQualities[a].quality.VideoBitrate > indexedQualities[b].quality.VideoBitrate
-	})
-
-	// nolint:gosec
-	return indexedQualities[0].index
-}
-
-// GetForbiddenUsernameList will return the blocked usernames as a comma separated string.
-func GetForbiddenUsernameList() []string {
-	usernames, err := _datastore.GetStringSlice(blockedUsernamesKey)
-	if err != nil {
-		return config.DefaultForbiddenUsernames
-	}
-
-	if len(usernames) == 0 {
-		return config.DefaultForbiddenUsernames
-	}
-
-	return usernames
-}
-
-// SetForbiddenUsernameList set the username blocklist as a comma separated string.
-func SetForbiddenUsernameList(usernames []string) error {
-	return _datastore.SetStringSlice(blockedUsernamesKey, usernames)
-}
-
-// GetSuggestedUsernamesList will return the suggested usernames.
-// If the number of suggested usernames is smaller than 10, the number pool is
-// not used (see code in the CreateAnonymousUser function).
-func GetSuggestedUsernamesList() []string {
-	usernames, err := _datastore.GetStringSlice(suggestedUsernamesKey)
-
-	if err != nil || len(usernames) == 0 {
-		return []string{}
-	}
-
-	return usernames
-}
-
-// SetSuggestedUsernamesList sets the username suggestion list.
-func SetSuggestedUsernamesList(usernames []string) error {
-	return _datastore.SetStringSlice(suggestedUsernamesKey, usernames)
-}
-
-// GetServerInitTime will return when the server was first setup.
-func GetServerInitTime() (*utils.NullTime, error) {
-	var t utils.NullTime
-
-	configEntry, err := _datastore.Get(serverInitDateKey)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := configEntry.getObject(&t); err != nil {
-		return nil, err
-	}
-
-	if !t.Valid {
-		return nil, err
-	}
-
-	return &t, nil
-}
-
-// SetServerInitTime will set when the server was first created.
-func SetServerInitTime(t time.Time) error {
-	nt := utils.NullTime{Time: t, Valid: true}
-	configEntry := ConfigEntry{Key: serverInitDateKey, Value: nt}
-	return _datastore.Save(configEntry)
-}
-
-// SetFederationEnabled will enable federation if set to true.
-func SetFederationEnabled(enabled bool) error {
-	return _datastore.SetBool(federationEnabledKey, enabled)
-}
-
-// GetFederationEnabled will return if federation is enabled.
-func GetFederationEnabled() bool {
-	enabled, err := _datastore.GetBool(federationEnabledKey)
-	if err == nil {
-		return enabled
-	}
-
-	return false
-}
-
-// SetFederationUsername will set the username used in federated activities.
-func SetFederationUsername(username string) error {
-	return _datastore.SetString(federationUsernameKey, username)
-}
-
-// GetFederationUsername will return the username used in federated activities.
-func GetFederationUsername() string {
-	username, err := _datastore.GetString(federationUsernameKey)
-	if username == "" || err != nil {
-		return config.GetDefaults().FederationUsername
-	}
-
-	return username
-}
-
-// SetFederationGoLiveMessage will set the message sent when going live.
-func SetFederationGoLiveMessage(message string) error {
-	return _datastore.SetString(federationGoLiveMessageKey, message)
-}
-
-// GetFederationGoLiveMessage will return the message sent when going live.
-func GetFederationGoLiveMessage() string {
-	// Empty message means it's disabled.
-	message, err := _datastore.GetString(federationGoLiveMessageKey)
-	if err != nil {
-		log.Traceln("unable to fetch go live message.", err)
-	}
-
-	return message
-}
-
-// SetFederationIsPrivate will set if federation activity is private.
-func SetFederationIsPrivate(isPrivate bool) error {
-	return _datastore.SetBool(federationPrivateKey, isPrivate)
-}
-
-// GetFederationIsPrivate will return if federation is private.
-func GetFederationIsPrivate() bool {
-	isPrivate, err := _datastore.GetBool(federationPrivateKey)
-	if err == nil {
-		return isPrivate
-	}
-
-	return false
-}
-
-// SetFederationShowEngagement will set if fediverse engagement shows in chat.
-func SetFederationShowEngagement(showEngagement bool) error {
-	return _datastore.SetBool(federationShowEngagementKey, showEngagement)
-}
-
-// GetFederationShowEngagement will return if fediverse engagement shows in chat.
-func GetFederationShowEngagement() bool {
-	showEngagement, err := _datastore.GetBool(federationShowEngagementKey)
-	if err == nil {
-		return showEngagement
-	}
-
-	return true
-}
-
-// SetBlockedFederatedDomains will set the blocked federated domains.
-func SetBlockedFederatedDomains(domains []string) error {
-	return _datastore.SetString(federationBlockedDomainsKey, strings.Join(domains, ","))
-}
-
-// GetBlockedFederatedDomains will return a list of blocked federated domains.
-func GetBlockedFederatedDomains() []string {
-	domains, err := _datastore.GetString(federationBlockedDomainsKey)
-	if err != nil {
-		return []string{}
-	}
-
-	if domains == "" {
-		return []string{}
-	}
-
-	return strings.Split(domains, ",")
-}
-
-// SetChatJoinMessagesEnabled will set if chat join messages are enabled.
-func SetChatJoinMessagesEnabled(enabled bool) error {
-	return _datastore.SetBool(chatJoinMessagesEnabledKey, enabled)
-}
-
-// GetChatJoinPartMessagesEnabled will return if chat join messages are enabled.
-func GetChatJoinPartMessagesEnabled() bool {
-	enabled, err := _datastore.GetBool(chatJoinMessagesEnabledKey)
-	if err != nil {
-		return true
-	}
-
-	return enabled
-}
-
-// SetNotificationsEnabled will save the enabled state of notifications.
-func SetNotificationsEnabled(enabled bool) error {
-	return _datastore.SetBool(notificationsEnabledKey, enabled)
-}
-
-// GetNotificationsEnabled will return the enabled state of notifications.
-func GetNotificationsEnabled() bool {
-	enabled, _ := _datastore.GetBool(notificationsEnabledKey)
-	return enabled
-}
-
-// GetDiscordConfig will return the Discord configuration.
-func GetDiscordConfig() models.DiscordConfiguration {
-	configEntry, err := _datastore.Get(discordConfigurationKey)
-	if err != nil {
-		return models.DiscordConfiguration{Enabled: false}
-	}
-
-	var config models.DiscordConfiguration
-	if err := configEntry.getObject(&config); err != nil {
-		return models.DiscordConfiguration{Enabled: false}
-	}
-
-	return config
-}
-
-// SetDiscordConfig will set the Discord configuration.
-func SetDiscordConfig(config models.DiscordConfiguration) error {
-	configEntry := ConfigEntry{Key: discordConfigurationKey, Value: config}
-	return _datastore.Save(configEntry)
-}
-
-// GetBrowserPushConfig will return the browser push configuration.
-func GetBrowserPushConfig() models.BrowserNotificationConfiguration {
-	configEntry, err := _datastore.Get(browserPushConfigurationKey)
-	if err != nil {
-		return models.BrowserNotificationConfiguration{Enabled: false}
-	}
-
-	var config models.BrowserNotificationConfiguration
-	if err := configEntry.getObject(&config); err != nil {
-		return models.BrowserNotificationConfiguration{Enabled: false}
-	}
-
-	return config
-}
-
-// SetBrowserPushConfig will set the browser push configuration.
-func SetBrowserPushConfig(config models.BrowserNotificationConfiguration) error {
-	configEntry := ConfigEntry{Key: browserPushConfigurationKey, Value: config}
-	return _datastore.Save(configEntry)
-}
-
-// SetBrowserPushPublicKey will set the public key for browser pushes.
-func SetBrowserPushPublicKey(key string) error {
-	return _datastore.SetString(browserPushPublicKeyKey, key)
-}
-
-// GetBrowserPushPublicKey will return the public key for browser pushes.
-func GetBrowserPushPublicKey() (string, error) {
-	return _datastore.GetString(browserPushPublicKeyKey)
-}
-
-// SetBrowserPushPrivateKey will set the private key for browser pushes.
-func SetBrowserPushPrivateKey(key string) error {
-	return _datastore.SetString(browserPushPrivateKeyKey, key)
-}
-
-// GetBrowserPushPrivateKey will return the private key for browser pushes.
-func GetBrowserPushPrivateKey() (string, error) {
-	return _datastore.GetString(browserPushPrivateKeyKey)
-}
-
-// SetHasPerformedInitialNotificationsConfig sets when performed initial setup.
-func SetHasPerformedInitialNotificationsConfig(hasConfigured bool) error {
-	return _datastore.SetBool(hasConfiguredInitialNotificationsKey, true)
-}
-
-// GetHasPerformedInitialNotificationsConfig gets when performed initial setup.
-func GetHasPerformedInitialNotificationsConfig() bool {
-	configured, _ := _datastore.GetBool(hasConfiguredInitialNotificationsKey)
-	return configured
-}
-
-// GetHideViewerCount will return if the viewer count shold be hidden.
-func GetHideViewerCount() bool {
-	hide, _ := _datastore.GetBool(hideViewerCountKey)
-	return hide
-}
-
-// SetHideViewerCount will set if the viewer count should be hidden.
-func SetHideViewerCount(hide bool) error {
-	return _datastore.SetBool(hideViewerCountKey, hide)
-}
-
-// GetCustomOfflineMessage will return the custom offline message.
-func GetCustomOfflineMessage() string {
-	message, _ := _datastore.GetString(customOfflineMessageKey)
-	return message
-}
-
-// SetCustomOfflineMessage will set the custom offline message.
-func SetCustomOfflineMessage(message string) error {
-	return _datastore.SetString(customOfflineMessageKey, message)
-}
-
-// SetCustomColorVariableValues sets CSS variable names and values.
-func SetCustomColorVariableValues(variables map[string]string) error {
-	return _datastore.SetStringMap(customColorVariableValuesKey, variables)
-}
-
-// GetCustomColorVariableValues gets CSS variable names and values.
-func GetCustomColorVariableValues() map[string]string {
-	values, _ := _datastore.GetStringMap(customColorVariableValuesKey)
-	return values
-}
-
-// GetStreamKeys will return valid stream keys.
-func GetStreamKeys() []models.StreamKey {
-	configEntry, err := _datastore.Get(streamKeysKey)
-	if err != nil {
-		return []models.StreamKey{}
-	}
-
-	var streamKeys []models.StreamKey
-	if err := configEntry.getObject(&streamKeys); err != nil {
-		return []models.StreamKey{}
-	}
-
-	return streamKeys
-}
-
-// SetStreamKeys will set valid stream keys.
-func SetStreamKeys(actions []models.StreamKey) error {
-	configEntry := ConfigEntry{Key: streamKeysKey, Value: actions}
-	return _datastore.Save(configEntry)
-}
-
-// SetDisableSearchIndexing will set if the web server should be indexable.
-func SetDisableSearchIndexing(disableSearchIndexing bool) error {
-	return _datastore.SetBool(disableSearchIndexingKey, disableSearchIndexing)
-}
-
-// GetDisableSearchIndexing will return if the web server should be indexable.
-func GetDisableSearchIndexing() bool {
-	disableSearchIndexing, err := _datastore.GetBool(disableSearchIndexingKey)
-	if err != nil {
-		return false
-	}
-	return disableSearchIndexing
-}
-
-// GetVideoServingEndpoint returns the custom video endpont.
-func GetVideoServingEndpoint() string {
-	message, _ := _datastore.GetString(videoServingEndpointKey)
-	return message
-}
-
-// SetVideoServingEndpoint sets the custom video endpoint.
-func SetVideoServingEndpoint(message string) error {
-	return _datastore.SetString(videoServingEndpointKey, message)
-}

core/data/crypto.go

@@ -1,23 +0,0 @@
-package data
-
-// GetPublicKey will return the public key.
-func GetPublicKey() string {
-	value, _ := _datastore.GetString(publicKeyKey)
-	return value
-}
-
-// SetPublicKey will save the public key.
-func SetPublicKey(key string) error {
-	return _datastore.SetString(publicKeyKey, key)
-}
-
-// GetPrivateKey will return the private key.
-func GetPrivateKey() string {
-	value, _ := _datastore.GetString(privateKeyKey)
-	return value
-}
-
-// SetPrivateKey will save the private key.
-func SetPrivateKey(key string) error {
-	return _datastore.SetString(privateKeyKey, key)
-}

core/data/data.go

@@ -11,6 +11,8 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/owncast/owncast/persistence/tables"
+
 	"github.com/owncast/owncast/config"
 	"github.com/owncast/owncast/utils"
 	log "github.com/sirupsen/logrus"
@@ -73,9 +75,9 @@ func SetupPersistence(file string) error {
 	_, _ = db.Exec("pragma temp_store = memory")
 	_, _ = db.Exec("pragma wal_checkpoint(full)")
 
-	createWebhooksTable()
-	createUsersTable(db)
-	createAccessTokenTable(db)
+	tables.CreateWebhooksTable(db)
+	tables.CreateUsersTable(db)
+	tables.CreateAccessTokenTable(db)
 
 	if _, err := db.Exec(`CREATE TABLE IF NOT EXISTS config (
 		"key" string NOT NULL PRIMARY KEY,
@@ -108,7 +110,7 @@ func SetupPersistence(file string) error {
 
 	// is database schema outdated?
 	if version < schemaVersion {
-		if err := migrateDatabaseSchema(db, version, schemaVersion); err != nil {
+		if err := tables.MigrateDatabaseSchema(db, version, schemaVersion); err != nil {
 			return err
 		}
 	}

core/data/data_test.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 	"testing"
+
+	"github.com/owncast/owncast/models"
 )
 
 func TestMain(m *testing.M) {
@@ -89,7 +91,7 @@ func TestCustomType(t *testing.T) {
 	}
 
 	// Save config entry to the database
-	if err := _datastore.Save(ConfigEntry{&testStruct, testKey}); err != nil {
+	if err := _datastore.Save(models.ConfigEntry{&testStruct, testKey}); err != nil {
 		t.Error(err)
 	}
 
@@ -101,7 +103,7 @@ func TestCustomType(t *testing.T) {
 
 	// Get a typed struct out of it
 	var testResult TestStruct
-	if err := entryResult.getObject(&testResult); err != nil {
+	if err := entryResult.GetObject(&testResult); err != nil {
 		t.Error(err)
 	}
 
@@ -121,7 +123,7 @@ func TestStringMap(t *testing.T) {
 	}
 
 	// Save config entry to the database
-	if err := _datastore.Save(ConfigEntry{&testMap, testKey}); err != nil {
+	if err := _datastore.Save(models.ConfigEntry{Value: &testMap, Key: testKey}); err != nil {
 		t.Error(err)
 	}
 
@@ -131,7 +133,7 @@ func TestStringMap(t *testing.T) {
 		t.Error(err)
 	}
 
-	testResult, err := entryResult.getStringMap()
+	testResult, err := entryResult.GetStringMap()
 	if err != nil {
 		t.Error(err)
 	}

core/data/datastore.go

@@ -5,12 +5,11 @@ import (
 	"database/sql"
 	"encoding/gob"
 	"sync"
-	"time"
 
 	// sqlite requires a blank import.
 	_ "github.com/mattn/go-sqlite3"
-	"github.com/owncast/owncast/config"
 	"github.com/owncast/owncast/db"
+	"github.com/owncast/owncast/models"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -21,7 +20,8 @@ type Datastore struct {
 	DbLock *sync.Mutex
 }
 
-func (ds *Datastore) warmCache() {
+// WarmCache pre-caches all configuration values in memory.
+func (ds *Datastore) WarmCache() {
 	log.Traceln("Warming config value cache")
 
 	res, err := ds.DB.Query("SELECT key, value FROM datastore")
@@ -46,10 +46,10 @@ func (ds *Datastore) GetQueries() *db.Queries {
 }
 
 // Get will query the database for the key and return the entry.
-func (ds *Datastore) Get(key string) (ConfigEntry, error) {
+func (ds *Datastore) Get(key string) (models.ConfigEntry, error) {
 	cachedValue, err := ds.GetCachedValue(key)
 	if err == nil {
-		return ConfigEntry{
+		return models.ConfigEntry{
 			Key:   key,
 			Value: cachedValue,
 		}, nil
@@ -60,10 +60,10 @@ func (ds *Datastore) Get(key string) (ConfigEntry, error) {
 
 	row := ds.DB.QueryRow("SELECT key, value FROM datastore WHERE key = ? LIMIT 1", key)
 	if err := row.Scan(&resultKey, &resultValue); err != nil {
-		return ConfigEntry{}, err
+		return models.ConfigEntry{}, err
 	}
 
-	result := ConfigEntry{
+	result := models.ConfigEntry{
 		Key:   resultKey,
 		Value: resultValue,
 	}
@@ -73,7 +73,7 @@ func (ds *Datastore) Get(key string) (ConfigEntry, error) {
 }
 
 // Save will save the ConfigEntry to the database.
-func (ds *Datastore) Save(e ConfigEntry) error {
+func (ds *Datastore) Save(e models.ConfigEntry) error {
 	ds.DbLock.Lock()
 	defer ds.DbLock.Unlock()
 
@@ -93,7 +93,6 @@ func (ds *Datastore) Save(e ConfigEntry) error {
 		return err
 	}
 	_, err = stmt.Exec(e.Key, dataGob.Bytes())
-
 	if err != nil {
 		return err
 	}
@@ -121,26 +120,6 @@ func (ds *Datastore) Setup() {
 	);`
 
 	ds.MustExec(createTableSQL)
-
-	if !HasPopulatedDefaults() {
-		PopulateDefaults()
-	}
-
-	if !hasPopulatedFederationDefaults() {
-		if err := SetFederationGoLiveMessage(config.GetDefaults().FederationGoLiveMessage); err != nil {
-			log.Errorln(err)
-		}
-		if err := _datastore.SetBool("HAS_POPULATED_FEDERATION_DEFAULTS", true); err != nil {
-			log.Errorln(err)
-		}
-	}
-
-	// Set the server initialization date if needed.
-	if hasSetInitDate, _ := GetServerInitTime(); hasSetInitDate == nil || !hasSetInitDate.Valid {
-		_ = SetServerInitTime(time.Now())
-	}
-
-	migrateDatastoreValues(_datastore)
 }
 
 // Reset will delete all config entries in the datastore and start over.
@@ -156,8 +135,6 @@ func (ds *Datastore) Reset() {
 	if _, err = stmt.Exec(); err != nil {
 		log.Fatalln(err)
 	}
-
-	PopulateDefaults()
 }
 
 // GetDatastore returns the shared instance of the owncast datastore.

core/data/defaults.go

@@ -1,54 +0,0 @@
-package data
-
-import (
-	"github.com/owncast/owncast/config"
-	"github.com/owncast/owncast/models"
-)
-
-// HasPopulatedDefaults will determine if the defaults have been inserted into the database.
-func HasPopulatedDefaults() bool {
-	hasPopulated, err := _datastore.GetBool("HAS_POPULATED_DEFAULTS")
-	if err != nil {
-		return false
-	}
-	return hasPopulated
-}
-
-func hasPopulatedFederationDefaults() bool {
-	hasPopulated, err := _datastore.GetBool("HAS_POPULATED_FEDERATION_DEFAULTS")
-	if err != nil {
-		return false
-	}
-	return hasPopulated
-}
-
-// PopulateDefaults will set default values in the database.
-func PopulateDefaults() {
-	_datastore.warmCache()
-
-	defaults := config.GetDefaults()
-
-	if HasPopulatedDefaults() {
-		return
-	}
-
-	_ = SetAdminPassword(defaults.AdminPassword)
-	_ = SetStreamKeys(defaults.StreamKeys)
-	_ = SetHTTPPortNumber(float64(defaults.WebServerPort))
-	_ = SetRTMPPortNumber(float64(defaults.RTMPServerPort))
-	_ = SetLogoPath(defaults.Logo)
-	_ = SetServerMetadataTags([]string{"owncast", "streaming"})
-	_ = SetServerSummary(defaults.Summary)
-	_ = SetServerWelcomeMessage("")
-	_ = SetServerName(defaults.Name)
-	_ = SetExtraPageBodyContent(defaults.PageBodyContent)
-	_ = SetFederationGoLiveMessage(defaults.FederationGoLiveMessage)
-	_ = SetSocialHandles([]models.SocialHandle{
-		{
-			Platform: "github",
-			URL:      "https://github.com/owncast/owncast",
-		},
-	})
-
-	_ = _datastore.SetBool("HAS_POPULATED_DEFAULTS", true)
-}

core/data/messages.go

@@ -1,40 +1,5 @@
 package data
 
-import (
-	"context"
-	"database/sql"
-
-	"github.com/owncast/owncast/db"
-	"github.com/owncast/owncast/models"
-	log "github.com/sirupsen/logrus"
-)
-
-// CreateMessagesTable will create the chat messages table if needed.
-func CreateMessagesTable(db *sql.DB) {
-	createTableSQL := `CREATE TABLE IF NOT EXISTS messages (
-		"id" string NOT NULL,
-		"user_id" TEXT,
-		"body" TEXT,
-		"eventType" TEXT,
-		"hidden_at" DATETIME,
-		"timestamp" DATETIME,
-		"title" TEXT,
-		"subtitle" TEXT,
-		"image" TEXT,
-		"link" TEXT,
-		PRIMARY KEY (id)
-	);`
-	MustExec(createTableSQL, db)
-
-	// Create indexes
-	MustExec(`CREATE INDEX IF NOT EXISTS user_id_hidden_at_timestamp ON messages (id, user_id, hidden_at, timestamp);`, db)
-	MustExec(`CREATE INDEX IF NOT EXISTS idx_id ON messages (id);`, db)
-	MustExec(`CREATE INDEX IF NOT EXISTS idx_user_id ON messages (user_id);`, db)
-	MustExec(`CREATE INDEX IF NOT EXISTS idx_hidden_at ON messages (hidden_at);`, db)
-	MustExec(`CREATE INDEX IF NOT EXISTS idx_timestamp ON messages (timestamp);`, db)
-	MustExec(`CREATE INDEX IF NOT EXISTS idx_messages_hidden_at_timestamp on messages(hidden_at, timestamp);`, db)
-}
-
 // GetMessagesCount will return the number of messages in the database.
 func GetMessagesCount() int64 {
 	query := `SELECT COUNT(*) FROM messages`
@@ -51,58 +16,3 @@ func GetMessagesCount() int64 {
 	}
 	return count
 }
-
-// CreateBanIPTable will create the IP ban table if needed.
-func CreateBanIPTable(db *sql.DB) {
-	createTableSQL := `  CREATE TABLE IF NOT EXISTS ip_bans (
-    "ip_address" TEXT NOT NULL PRIMARY KEY,
-    "notes" TEXT,
-    "created_at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-  );`
-
-	stmt, err := db.Prepare(createTableSQL)
-	if err != nil {
-		log.Fatal("error creating ip ban table", err)
-	}
-	defer stmt.Close()
-	if _, err := stmt.Exec(); err != nil {
-		log.Fatal("error creating ip ban table", err)
-	}
-}
-
-// BanIPAddress will persist a new IP address ban to the datastore.
-func BanIPAddress(address, note string) error {
-	return _datastore.GetQueries().BanIPAddress(context.Background(), db.BanIPAddressParams{
-		IpAddress: address,
-		Notes:     sql.NullString{String: note, Valid: true},
-	})
-}
-
-// IsIPAddressBanned will return if an IP address has been previously blocked.
-func IsIPAddressBanned(address string) (bool, error) {
-	blocked, error := _datastore.GetQueries().IsIPAddressBlocked(context.Background(), address)
-	return blocked > 0, error
-}
-
-// GetIPAddressBans will return all the banned IP addresses.
-func GetIPAddressBans() ([]models.IPAddress, error) {
-	result, err := _datastore.GetQueries().GetIPAddressBans(context.Background())
-	if err != nil {
-		return nil, err
-	}
-
-	response := []models.IPAddress{}
-	for _, ip := range result {
-		response = append(response, models.IPAddress{
-			IPAddress: ip.IpAddress,
-			Notes:     ip.Notes.String,
-			CreatedAt: ip.CreatedAt.Time,
-		})
-	}
-	return response, err
-}
-
-// RemoveIPAddressBan will remove a previously banned IP address.
-func RemoveIPAddressBan(address string) error {
-	return _datastore.GetQueries().RemoveIPAddressBan(context.Background(), address)
-}