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/atomic-refactor-pull-request-for-issue-2119.md

@@ -1,23 +0,0 @@
-<!-- this template is for changes relating to #2119. You might want to use the standard template. -->
-
-# Description
-
-<!-- do not remove -->
-This PR is for updating/adding a component following the atomic design pattern set out in #2119.
-
-<!-- mention the component you changed, and describe any design choices if necessary -->
-
----
-
-Extra Info
-
-<!-- fill these in -->
-- Component name in [kanban board](https://collab.owncast.tv/kanban/#/2/kanban/edit/omLI2N+LcnP+elmdT7qW9GHD/): `________`
-
-Checklist: 
-- [] The component follows the [design guide](../../web/components/_COMPONENT_HOW_TO.md).
-- [] Moved the component to the correct `atoms` / `molecules` / `organisms` / `templates` directory. 
-- [] Added an explanation to this PR for any major changes you made.
-- [] Replaced any [`defaultProps`](https://www.reactjstutorials.com/react-basics/17/react-default-props) with default args.
-- [] Added a (short) JSDoc description to the component.
-- [] Removed the component's Storybook description text with if it's not needed.

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

@@ -1,10 +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.
 
-# 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:
@@ -14,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.
+Thank you so much for contributing to Owncast! 🎉

.github/codeql/go.yml

@@ -0,0 +1 @@
+name: Go config

.github/codeql/javascript.yml

@@ -0,0 +1,4 @@
+name: Javascript config
+
+paths-ignore:
+  - static/web

.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@v3
+      - 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@6534843181fc2aeb7f9f1cd3cd4a7b956cada2db
+        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@v2
+        uses: docker/setup-qemu-action@v3
         with:
           image: tonistiigi/binfmt:latest
           platforms: all
 
-      - uses: actions/checkout@v3
-
       - 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
-        uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
+      - name: Check out pull request code
+        uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
         with:
-          node-version: 18.9.0
+          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: '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.18.8'
+          go-version: '1.22'
           cache: true
 
       - name: Install Google Chrome
-        run: sudo apt-get install google-chrome-stable
+        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

@@ -11,11 +11,18 @@ jobs:
     if: github.repository == 'owncast/owncast'
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - 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 +54,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/bundle-web.yml

@@ -1,44 +0,0 @@
-name: Build and bundle web app into Owncast
-on:
-  push:
-    branches:
-      - develop
-    paths:
-      - 'web/**'
-      - '!**.md'
-
-jobs:
-  bundle:
-    runs-on: ubuntu-latest
-    if: github.repository == 'owncast/owncast'
-
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules-bundle-web-app
-        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: Bundle web app (next.js build)
-        uses: actions/checkout@v3
-      - run: build/web/bundleWeb.sh
-
-      - name: Commit changes
-        uses: EndBug/add-and-commit@v9
-        with:
-          pull: --rebase --autostash
-          message: 'Bundle embedded web app'
-          add: 'static/web'
-          author_name: Owncast
-          author_email: owncast@owncast.online

.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' }}
-        uses: actions/checkout@v3
+
+      - 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,40 +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@v3
+      - 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 }}
-        # 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@v3
+      - 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

@@ -32,15 +32,20 @@ jobs:
         run: echo "${{ secrets.GH_CR_PAT }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           image: tonistiigi/binfmt:latest
           platforms: all
 
-      - name: Checkout repo
-        uses: actions/checkout@v3
+      - 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@v3
+      - 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

@@ -22,17 +22,17 @@ jobs:
         with:
           concurrent_skipping: 'same_content_newer'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.18.8'
+          go-version: '1.22'
           cache: true
-      - uses: actions/checkout@v3
+      - 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,19 +12,39 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.18.x, 1.19.x]
+        go-version: [1.21.x, 1.22.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      - 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
+            ~/go/pkg/mod
+          key: go-test-${{ github.sha }}
+          restore-keys: |
+            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:
@@ -38,13 +58,32 @@ jobs:
             version: 6.8
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      - 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
+            ~/go/pkg/mod
+          key: go-test-${{ github.sha }}
+          restore-keys: |
+            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@v3
-      - 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.18.8'
+          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

@@ -0,0 +1,222 @@
+name: Javascript
+
+# This action works with pull requests and pushes
+on:
+  push:
+    paths:
+      - web/**
+      - '!**.md'
+
+  pull_request:
+    paths:
+      - web/**
+      - '!**.md'
+
+jobs:
+  formatting:
+    name: Code formatting
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web
+
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+          cancel_others: 'true'
+          skip_after_successful_duplicate: 'true'
+
+      - 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 }}
+          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@v45
+        with:
+          path: 'web'
+          files_ignore: |
+            static/**
+            web/next.config.js
+          files_yaml: |
+            src:
+              - '**/*.{js,ts,tsx,jsx,md}'
+
+      - name: Cache node modules
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-node-modules-bundle-web-app
+        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
+        run: npm install
+
+      - 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: 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' && 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:
+    name: Test for unused code
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web
+
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+          cancel_others: 'true'
+          skip_after_successful_duplicate: 'true'
+
+      - 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: Setup Nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.9.0'
+
+      - name: Cache node modules
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-node-modules-bundle-web-app
+        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
+        run: npm install
+
+      - 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.
+  web-bundle:
+    name: Build and bundle web project
+    runs-on: ubuntu-latest
+    if: github.repository == 'owncast/owncast'
+    needs: [formatting, unused-code]
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
+          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@v4
+        env:
+          cache-name: cache-node-modules-bundle-web-app
+        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: 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: Bundle web app (next.js build)
+        run: build/web/bundleWeb.sh
+
+      - name: Rebase
+        if: ${{ github.ref == 'refs/heads/develop' }}
+        run: |
+          git add static/web
+          git pull --rebase --autostash
+
+        # Only commit built web project files on develop.
+      - name: Commit changes
+        if: ${{ github.ref == 'refs/heads/develop' }}
+        uses: EndBug/add-and-commit@v9
+        with:
+          message: 'Bundle embedded web app'
+          add: 'static/web'
+          author_name: Owncast
+          author_email: owncast@owncast.online
+
+      - name: Push changes
+        if: ${{ github.ref == 'refs/heads/develop' }}
+        run: |
+          git pull --rebase --autostash
+          git push

.github/workflows/javascript-formatting.yml

@@ -1,96 +0,0 @@
-name: Lint
-
-# This action works with pull requests and pushes
-on:
-  push:
-    paths:
-      - web/**
-  pull_request_target:
-    paths:
-      - web/**
-
-jobs:
-  prettier:
-    name: Javascript prettier
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./web
-
-    if: ${{ github.actor != 'dependabot[bot]' }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        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: Prettify code
-        uses: creyD/prettier_action@v4.3
-        with:
-          # This part is also where you can pass other options, for example:
-          prettier_options: --write **/*.{js,ts,jsx,tsx,css,md}
-          only_changed: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  linter:
-    name: Javascript linter
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./web
-
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        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: Install Dependencies
-        run: npm install
-
-      - name: Lint
-        run: npm run lint
-
-  unused-code:
-    name: Test for unused code
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./web
-
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        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: Install Dependencies
-        run: npm install
-
-      - name: Check for unused JS code and dependencies
-        run: npx knip --include dependencies,files,exports

.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@v3
-
-      - uses: actions/setup-node@v3
-        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@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.18.8'
-          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@v3
+      - 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/test-webapp-build.yaml

@@ -1,50 +0,0 @@
-name: Webapp Test Build
-
-# This action works with pull requests and pushes
-on:
-  push:
-    paths:
-      - web/**
-  pull_request:
-    paths:
-      - web/**
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./web
-
-    name: Build webapp
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: 'same_content_newer'
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        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: Cache node modules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules-bundle-web-app
-        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
-        run: npm install
-
-      - name: Build
-        run: npm run build

.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
@@ -42,6 +43,7 @@ test/automated/browser/screenshots
 lefthook.yml
 test/automated/browser/cypress/screenshots
 test/automated/browser/cypress/videos
+web/style-definitions/build/
 
 web/public/sw.js
 web/public/workbox-*.js

.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.18'
+  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.18'
-    # https://staticcheck.io/docs/options#checks
-    checks: ['all']
-
   gocritic:
     disabled-checks:
       - ifElseChain

.vscode/settings.json

@@ -1,28 +0,0 @@
-{
-    "cSpell.words": [
-        "Debugln",
-        "Errorln",
-        "Fediverse",
-        "Ffmpeg",
-        "ffmpegpath",
-        "ffmpg",
-        "geoip",
-        "gosec",
-        "mattn",
-        "Mbps",
-        "nolint",
-        "Owncast",
-        "ppid",
-        "preact",
-        "RTMP",
-        "rtmpserverport",
-        "sqlite",
-        "Tracef",
-        "Traceln",
-        "upgrader",
-        "Upgrader",
-        "videojs",
-        "Warnf",
-        "Warnln"
-    ]
-}

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.0
+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,15 +1,15 @@
 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
 
 build-all:
-  BUILD --platform=linux/amd64 --platform=linux/386 --platform=linux/arm64 --platform=linux/arm/v7 --platform=darwin/amd64 +build
+  BUILD --platform=linux/amd64 --platform=linux/386 --platform=linux/arm64 --platform=linux/arm/v7 --platform=darwin/amd64 --platform=darwin/arm64 +build
 
 package-all:
-  BUILD --platform=linux/amd64 --platform=linux/386 --platform=linux/arm64 --platform=linux/arm/v7 --platform=darwin/amd64 +package
+  BUILD --platform=linux/amd64 --platform=linux/386 --platform=linux/arm64 --platform=linux/arm/v7 --platform=darwin/amd64 --platform=darwin/arm64 +package
 
 docker-all:
   BUILD --platform=linux/amd64 --platform=linux/386 --platform=linux/arm64 --platform=linux/arm/v7 +docker
@@ -36,7 +36,6 @@ build:
 
   FROM --platform=linux/amd64 +code
 
-  RUN echo $EARTHLY_GIT_HASH
   RUN echo "Finding CC configuration for $TARGETPLATFORM"
   IF [ "$TARGETPLATFORM" = "linux/amd64" ]
     ARG NAME=linux-64bit
@@ -59,6 +58,10 @@ build:
     ARG NAME=macOS-64bit
     ARG CC=o64-clang
     ARG CXX=o64-clang++
+  ELSE IF [ "$TARGETPLATFORM" = "darwin/arm64" ]
+    ARG NAME=macOS-arm64
+    ARG CC=o64-clang
+    ARG CXX=o64-clang++
   ELSE
     RUN echo "Failed to find CC configuration for $TARGETPLATFORM"
     ARG --required CC
@@ -76,12 +79,15 @@ build:
   # MacOSX disallows static executables, so we omit the static flag on this platform
   RUN go build -a -installsuffix cgo -ldflags "$([ "$GOOS"z != darwinz ] && echo "-linkmode external -extldflags -static ") -s -w -X github.com/owncast/owncast/config.GitCommit=$EARTHLY_GIT_HASH -X github.com/owncast/owncast/config.VersionNumber=$version -X github.com/owncast/owncast/config.BuildPlatform=$NAME" -tags sqlite_omit_load_extension -o owncast main.go
 
-	# Decrease the size of the shipped binary
-	RUN upx --best --lzma owncast
-	# Test the binary
-	RUN upx -t owncast
+	# Decrease the size of the shipped binary. But only for non-Apple platforms.
+  # See https://github.com/upx/upx/issues/612
+  IF [ "$GOOS" != "darwin" ]
+	  RUN upx --best --lzma owncast
+	  # Test the binary
+	  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
@@ -97,25 +103,27 @@ package:
     ARG NAME=linux-arm7
   ELSE IF [ "$TARGETPLATFORM" = "darwin/amd64" ]
     ARG NAME=macOS-64bit
+  ELSE IF [ "$TARGETPLATFORM" = "darwin/arm64" ]
+    ARG NAME=macOS-arm64
   ELSE
     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 /build/dist/owncast.zip owncast.zip AS LOCAL dist/$ZIPNAME
+  SAVE ARTIFACT --keep-ts /build/dist/owncast.zip owncast.zip AS LOCAL dist/$ZIPNAME
 
 docker:
 	# Multiple image names can be tagged at once. They should all be passed
 	# 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
@@ -137,12 +145,6 @@ docker:
 dockerfile:
   FROM DOCKERFILE -f Dockerfile .
 
-testing:
-	ARG images
-	FOR i IN ${images}
-		RUN echo "Testing ${i}"
-	END
-
 unit-tests:
   FROM --platform=linux/amd64 bdwyertech/go-crosscompile
   COPY . /build

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Gabe Kangas
+Copyright (c) 2020-2023 Gabe Kangas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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 -->
@@ -48,8 +59,8 @@ Owncast is an open source, self-hosted, decentralized, single user live video st
 
 <div>
     <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/owncast/owncast/total?style=for-the-badge">
-	  <a href="https://hub.docker.com/r/gabekangas/owncast">
-      <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/gabekangas/owncast?style=for-the-badge">
+	  <a href="https://hub.docker.com/r/owncast/owncast">
+      <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/owncast/owncast?style=for-the-badge">
 	  </a>
     <a href="https://github.com/owncast/owncast/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22">
       <img alt="GitHub issues by-label" src="https://img.shields.io/github/issues-raw/owncast/owncast/good%20first%20issue?style=for-the-badge">
@@ -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.18 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,33 +9,33 @@ 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"
 )
 
 // ActivityPubActor represents a single actor in handling ActivityPub activity.
 type ActivityPubActor struct {
+	// RequestObject is the actual follow request object.
+	RequestObject vocab.ActivityStreamsFollow
+	// W3IDSecurityV1PublicKey is the public key of the actor.
+	W3IDSecurityV1PublicKey vocab.W3IDSecurityV1PublicKeyProperty
 	// ActorIRI is the IRI of the remote actor.
 	ActorIri *url.URL
 	// FollowRequestIRI is the unique identifier of the follow request.
 	FollowRequestIri *url.URL
 	// Inbox is the inbox URL of the remote follower
 	Inbox *url.URL
+	// Image is the avatar image of the Actor.
+	Image *url.URL
+	// DisabledAt is the time, if any, this follower was blocked/removed.
+	DisabledAt *time.Time
 	// Name is the display name of the follower.
 	Name string
 	// Username is the account username of the remote actor.
 	Username string
 	// FullUsername is the username@account.tld representation of the user.
 	FullUsername string
-	// Image is the avatar image of the Actor.
-	Image *url.URL
-	// RequestObject is the actual follow request object.
-	RequestObject vocab.ActivityStreamsFollow
-	// W3IDSecurityV1PublicKey is the public key of the actor.
-	W3IDSecurityV1PublicKey vocab.W3IDSecurityV1PublicKeyProperty
-	// DisabledAt is the time, if any, this follower was blocked/removed.
-	DisabledAt *time.Time
 }
 
 // DeleteRequest represents a request for delete.
@@ -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

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"net/url"
 	"path"
+	"path/filepath"
 
 	"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"
 )
 
@@ -26,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)
@@ -40,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)
@@ -60,3 +65,56 @@ func Serialize(obj vocab.Type) ([]byte, error) {
 
 	return b, err
 }
+
+// MakeLocalIRIForStreamURL will return a full IRI for the local server stream url.
+func MakeLocalIRIForStreamURL() *url.URL {
+	configRepository := configrepository.Get()
+
+	host := configRepository.GetServerURL()
+	u, err := url.Parse(host)
+	if err != nil {
+		log.Errorln("unable to parse local IRI stream url", err)
+		return nil
+	}
+
+	u.Path = path.Join(u.Path, "/hls/stream.m3u8")
+
+	return u
+}
+
+// MakeLocalIRIforLogo will return a full IRI for the local server logo.
+func MakeLocalIRIforLogo() *url.URL {
+	configRepository := configrepository.Get()
+
+	host := configRepository.GetServerURL()
+	u, err := url.Parse(host)
+	if err != nil {
+		log.Errorln("unable to parse local IRI stream url", err)
+		return nil
+	}
+
+	u.Path = path.Join(u.Path, "/logo/external")
+
+	return u
+}
+
+// GetLogoType will return the rel value for the webfinger response and
+// the default static image is of type png.
+func GetLogoType() string {
+	configRepository := configrepository.Get()
+
+	imageFilename := configRepository.GetLogoPath()
+	if imageFilename == "" {
+		return "image/png"
+	}
+
+	logoType := "image/jpeg"
+	if filepath.Ext(imageFilename) == ".svg" {
+		logoType = "image/svg+xml"
+	} else if filepath.Ext(imageFilename) == ".gif" {
+		logoType = "image/gif"
+	} else if filepath.Ext(imageFilename) == ".png" {
+		logoType = "image/png"
+	}
+	return logoType
+}

activitypub/apmodels/webfinger.go

@@ -26,7 +26,9 @@ type Link struct {
 // MakeWebfingerResponse will create a new Webfinger response.
 func MakeWebfingerResponse(account string, inbox string, host string) WebfingerResponse {
 	accountIRI := MakeLocalIRIForAccount(account)
-
+	streamIRI := MakeLocalIRIForStreamURL()
+	logoIRI := MakeLocalIRIforLogo()
+	logoType := GetLogoType()
 	return WebfingerResponse{
 		Subject: fmt.Sprintf("acct:%s@%s", account, host),
 		Aliases: []string{
@@ -43,6 +45,16 @@ func MakeWebfingerResponse(account string, inbox string, host string) WebfingerR
 				Type: "text/html",
 				Href: accountIRI.String(),
 			},
+			{
+				Rel:  "http://webfinger.net/rel/avatar",
+				Type: logoType,
+				Href: logoIRI.String(),
+			},
+			{
+				Rel:  "alternate",
+				Type: "application/x-mpegURL",
+				Href: streamIRI.String(),
+			},
 		},
 	}
 }

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(),
 		},
 	}
 
@@ -154,21 +158,23 @@ func XNodeInfo2Controller(w http.ResponseWriter, r *http.Request) {
 		LocalComments int   `json:"localComments"`
 	}
 	type response struct {
-		Organization      Organization `json:"organization"`
 		Server            Server       `json:"server"`
+		Organization      Organization `json:"organization"`
+		Version           string       `json:"version"`
 		Services          Services     `json:"services"`
 		Protocols         []string     `json:"protocols"`
-		Version           string       `json:"version"`
-		OpenRegistrations bool         `json:"openRegistrations"`
 		Usage             Usage        `json:"usage"`
+		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{
@@ -224,20 +230,22 @@ func InstanceV1Controller(w http.ResponseWriter, r *http.Request) {
 		ShortDescription string   `json:"short_description"`
 		Description      string   `json:"description"`
 		Version          string   `json:"version"`
-		Stats            Stats    `json:"stats"`
 		Thumbnail        string   `json:"thumbnail"`
 		Languages        []string `json:"languages"`
+		Stats            Stats    `json:"stats"`
 		Registrations    bool     `json:"registrations"`
 		ApprovalRequired bool     `json:"approval_required"`
 		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/like.go

@@ -13,6 +13,14 @@ import (
 func handleLikeRequest(c context.Context, activity vocab.ActivityStreamsLike) error {
 	object := activity.GetActivityStreamsObject()
 	actorReference := activity.GetActivityStreamsActor()
+	if object.Len() < 1 {
+		return errors.New("like activity is missing object")
+	}
+
+	if actorReference.Len() < 1 {
+		return errors.New("like activity is missing actor")
+	}
+
 	objectIRI := object.At(0).GetIRI().String()
 	actorIRI := actorReference.At(0).GetIRI().String()
 

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/inbox/workerpool.go

@@ -1,14 +1,14 @@
 package inbox
 
 import (
+	"runtime"
+
 	"github.com/owncast/owncast/activitypub/apmodels"
 	log "github.com/sirupsen/logrus"
 )
 
-const (
-	// InboxWorkerPoolSize defines the number of concurrent ActivityPub handlers.
-	InboxWorkerPoolSize = 10
-)
+// workerPoolSize defines the number of concurrent ActivityPub handlers.
+var workerPoolSize = runtime.GOMAXPROCS(0)
 
 // Job struct bundling the ActivityPub and the payload in one struct.
 type Job struct {
@@ -22,7 +22,7 @@ func InitInboxWorkerPool() {
 	queue = make(chan Job)
 
 	// start workers
-	for i := 1; i <= InboxWorkerPoolSize; i++ {
+	for i := 1; i <= workerPoolSize; i++ {
 		go worker(i, queue)
 	}
 }

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><a href=\"%s\">%s</a>", 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

@@ -3,14 +3,14 @@ package resolvers
 import (
 	"context"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/go-fed/activity/streams"
 	"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
 	}
@@ -63,7 +64,7 @@ func ResolveIRI(c context.Context, iri string, callbacks ...interface{}) error {
 
 	defer response.Body.Close()
 
-	data, err := ioutil.ReadAll(response.Body)
+	data, err := io.ReadAll(response.Body)
 	if 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/webfinger/webfinger.go

@@ -2,10 +2,13 @@ package webfinger
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
 	"strings"
+
+	"github.com/owncast/owncast/utils"
 )
 
 // GetWebfingerLinks will return webfinger data for an account.
@@ -18,6 +21,11 @@ func GetWebfingerLinks(account string) ([]map[string]interface{}, error) {
 	accountComponents := strings.Split(account, "@")
 	fediverseServer := accountComponents[1]
 
+	// Reject any requests to our internal network or loopback.
+	if utils.IsHostnameInternal(fediverseServer) {
+		return nil, errors.New("unable to use provided host as a valid fediverse server")
+	}
+
 	// HTTPS is required.
 	requestURL, err := url.Parse("https://" + fediverseServer)
 	if err != nil {

activitypub/workerpool/outbound.go

@@ -6,11 +6,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-const (
-	// ActivityPubWorkerPoolSize defines the number of concurrent HTTP ActivityPub requests.
-	ActivityPubWorkerPoolSize = 10
-)
-
 // Job struct bundling the ActivityPub and the payload in one struct.
 type Job struct {
 	request *http.Request
@@ -19,19 +14,24 @@ 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 <= ActivityPubWorkerPoolSize; i++ {
+	for i := 1; i <= workerPoolSize; i++ {
 		go worker(i, queue)
 	}
 }
 
 // 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/fediverse/fediverse.go

@@ -13,11 +13,11 @@ import (
 
 // OTPRegistration represents a single OTP request.
 type OTPRegistration struct {
+	Timestamp       time.Time
 	UserID          string
 	UserDisplayName string
 	Code            string
 	Account         string
-	Timestamp       time.Time
 }
 
 // Key by access token to limit one OTP request for a person

auth/indieauth/client.go

@@ -11,7 +11,8 @@ 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"
 )
@@ -46,11 +47,30 @@ 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.")
 	}
 
-	serverURL := data.GetServerURL()
+	// Reject any requests to our internal network or loopback
+	if utils.IsHostnameInternal(authHost) {
+		return nil, errors.New("unable to use provided host")
+	}
+
+	// Santity check the server URL
+	u, err := url.ParseRequestURI(authHost)
+	if err != nil {
+		return nil, errors.New("unable to parse server URL")
+	}
+
+	// Limit to only secured connections
+	if u.Scheme != "https" {
+		return nil, errors.New("only servers secured with https are supported")
+	}
+
+	serverURL := configRepository.GetServerURL()
 	if serverURL == "" {
 		return nil, errors.New("Owncast server URL must be set when using auth")
 	}

auth/indieauth/request.go

@@ -7,16 +7,16 @@ import (
 
 // Request represents a single in-flight IndieAuth request.
 type Request struct {
-	UserID             string
-	DisplayName        string
-	CurrentAccessToken string
+	Timestamp          time.Time
 	Endpoint           *url.URL
 	Redirect           *url.URL // Outbound redirect URL to continue auth flow
 	Callback           *url.URL // Inbound URL to get auth flow results
+	Me                 *url.URL
+	UserID             string
+	DisplayName        string
+	CurrentAccessToken string
 	ClientID           string
 	CodeVerifier       string
 	CodeChallenge      string
 	State              string
-	Me                 *url.URL
-	Timestamp          time.Time
 }

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"
 )
@@ -12,13 +12,13 @@ import (
 // ServerAuthRequest is n inbound request to authenticate against
 // this Owncast instance.
 type ServerAuthRequest struct {
+	Timestamp     time.Time
 	ClientID      string
 	RedirectURI   string
 	CodeChallenge string
 	State         string
 	Me            string
 	Code          string
-	Timestamp     time.Time
 }
 
 // ServerProfile represents basic user-provided data about this Owncast instance.
@@ -40,7 +40,7 @@ type ServerProfileResponse struct {
 
 var pendingServerAuthRequests = map[string]ServerAuthRequest{}
 
-const maxPendingRequests = 1000
+const maxPendingRequests = 100
 
 // StartServerAuth will handle the authentication for the admin user of this
 // Owncast server. Initiated via a GET of the auth endpoint.
@@ -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

@@ -5,17 +5,29 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+OFFLINE=
+while [[ $# -gt 0 ]]; do
+	case $1 in
+	--offline)
+		OFFLINE=1
+		;;
+	esac
+	shift
+done
+
 # Change to the root directory of the repository
 cd "$(git rev-parse --show-toplevel)"
 
 cd web
 
-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.0" // 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

@@ -8,32 +8,37 @@ import (
 
 // Defaults will hold default configuration values.
 type Defaults struct {
-	Name                 string
-	Title                string
+	PageBodyContent string
+
+	FederationGoLiveMessage string
+
 	Summary              string
 	ServerWelcomeMessage string
 	Logo                 string
-	Tags                 []string
-	PageBodyContent      string
+	YPServer             string
+
+	Title string
 
 	DatabaseFilePath string
-	WebServerPort    int
-	WebServerIP      string
-	RTMPServerPort   int
-	AdminPassword    string
-	StreamKeys       []models.StreamKey
 
-	YPEnabled bool
-	YPServer  string
+	FederationUsername string
+	WebServerIP        string
+	Name               string
+	AdminPassword      string
+	StreamKeys         []models.StreamKey
+
+	StreamVariants []models.StreamOutputVariant
+
+	Tags               []string
+	RTMPServerPort     int
+	SegmentsInPlaylist int
 
 	SegmentLengthSeconds int
-	SegmentsInPlaylist   int
-	StreamVariants       []models.StreamOutputVariant
-
-	FederationUsername      string
-	FederationGoLiveMessage string
+	WebServerPort        int
 
 	ChatEstablishedUserModeTimeDuration time.Duration
+
+	YPEnabled bool
 }
 
 // GetDefaults will return default configuration values.

config/verifyInstall.go

@@ -29,8 +29,8 @@ func VerifyFFMpegPath(path string) error {
 	}
 
 	mode := stat.Mode()
-	//source: https://stackoverflow.com/a/60128480
-	if mode&0111 == 0 {
+	// source: https://stackoverflow.com/a/60128480
+	if mode&0o111 == 0 {
 		return errors.New("ffmpeg path is not executable")
 	}
 

contrib/owncast_for_windows.md

@@ -43,7 +43,7 @@ Here is the list for all the prerequisites required ->
 - npm (Node Package Manager) is installed as `sudo apt install npm`.
 - Node.js is installed (LTS Version) `sudo apt install nodejs`.
 - [ffmpeg](https://ffmpeg.org/download.html)
-- Install the [Go toolchain](https://golang.org/dl/) (1.18 or above).
+- Install the [Go toolchain](https://golang.org/dl/) (1.21 or above).
 
 ### Read more
 

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/config.go

@@ -1,817 +0,0 @@
-package admin
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"reflect"
-	"strings"
-
-	"github.com/owncast/owncast/activitypub/outbox"
-	"github.com/owncast/owncast/controllers"
-	"github.com/owncast/owncast/core/chat"
-	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/core/user"
-	"github.com/owncast/owncast/core/webhooks"
-	"github.com/owncast/owncast/models"
-	"github.com/owncast/owncast/utils"
-	log "github.com/sirupsen/logrus"
-	"github.com/teris-io/shortid"
-)
-
-// ConfigValue is a container object that holds a value, is encoded, and saved to the database.
-type ConfigValue struct {
-	Value interface{} `json:"value"`
-}
-
-// SetTags will handle the web config request to set tags.
-func SetTags(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValues, success := getValuesFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	tagStrings := make([]string, 0)
-	for _, tag := range configValues {
-		tagStrings = append(tagStrings, strings.TrimLeft(tag.Value.(string), "#"))
-	}
-
-	if err := data.SetServerMetadataTags(tagStrings); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	// Update Fediverse followers about this change.
-	if err := outbox.UpdateFollowersWithAccountUpdates(); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetStreamTitle will handle the web config request to set the current stream title.
-func SetStreamTitle(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	value := configValue.Value.(string)
-
-	if err := data.SetStreamTitle(value); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-	if value != "" {
-		sendSystemChatAction(fmt.Sprintf("Stream title changed to **%s**", value), true)
-		go webhooks.SendStreamStatusEvent(models.StreamTitleUpdated)
-	}
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// ExternalSetStreamTitle will change the stream title on behalf of an external integration API request.
-func ExternalSetStreamTitle(integration user.ExternalAPIUser, w http.ResponseWriter, r *http.Request) {
-	SetStreamTitle(w, r)
-}
-
-func sendSystemChatAction(messageText string, ephemeral bool) {
-	if err := chat.SendSystemAction(messageText, ephemeral); err != nil {
-		log.Errorln(err)
-	}
-}
-
-// SetServerName will handle the web config request to set the server's name.
-func SetServerName(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetServerName(configValue.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	// Update Fediverse followers about this change.
-	if err := outbox.UpdateFollowersWithAccountUpdates(); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetServerSummary will handle the web config request to set the about/summary text.
-func SetServerSummary(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetServerSummary(configValue.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	// Update Fediverse followers about this change.
-	if err := outbox.UpdateFollowersWithAccountUpdates(); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetCustomOfflineMessage will set a message to display when the server is offline.
-func SetCustomOfflineMessage(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetCustomOfflineMessage(strings.TrimSpace(configValue.Value.(string))); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetServerWelcomeMessage will handle the web config request to set the welcome message text.
-func SetServerWelcomeMessage(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetServerWelcomeMessage(strings.TrimSpace(configValue.Value.(string))); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetExtraPageContent will handle the web config request to set the page markdown content.
-func SetExtraPageContent(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetExtraPageBodyContent(configValue.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetAdminPassword will handle the web config request to set the server admin password.
-func SetAdminPassword(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetAdminPassword(configValue.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetLogo will handle a new logo image file being uploaded.
-func SetLogo(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	value, ok := configValue.Value.(string)
-	if !ok {
-		controllers.WriteSimpleResponse(w, false, "unable to find image data")
-		return
-	}
-	bytes, extension, err := utils.DecodeBase64Image(value)
-	if err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	imgPath := filepath.Join("data", "logo"+extension)
-	if err := os.WriteFile(imgPath, bytes, 0o600); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	if err := data.SetLogoPath("logo" + extension); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	if err := data.SetLogoUniquenessString(shortid.MustGenerate()); err != nil {
-		log.Error("Error saving logo uniqueness string: ", err)
-	}
-
-	// Update Fediverse followers about this change.
-	if err := outbox.UpdateFollowersWithAccountUpdates(); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetNSFW will handle the web config request to set the NSFW flag.
-func SetNSFW(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetNSFW(configValue.Value.(bool)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetFfmpegPath will handle the web config request to validate and set an updated copy of ffmpg.
-func SetFfmpegPath(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	path := configValue.Value.(string)
-	if err := utils.VerifyFFMpegPath(path); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	if err := data.SetFfmpegPath(configValue.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}
-
-// SetWebServerPort will handle the web config request to set the server's HTTP port.
-func SetWebServerPort(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if port, ok := configValue.Value.(float64); ok {
-		if (port < 1) || (port > 65535) {
-			controllers.WriteSimpleResponse(w, false, "Port number must be between 1 and 65535")
-			return
-		}
-		if err := data.SetHTTPPortNumber(port); err != nil {
-			controllers.WriteSimpleResponse(w, false, err.Error())
-			return
-		}
-
-		controllers.WriteSimpleResponse(w, true, "HTTP port set")
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, false, "Invalid type or value, port must be a number")
-}
-
-// SetWebServerIP will handle the web config request to set the server's HTTP listen address.
-func SetWebServerIP(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if input, ok := configValue.Value.(string); ok {
-		if ip := net.ParseIP(input); ip != nil {
-			if err := data.SetHTTPListenAddress(ip.String()); err != nil {
-				controllers.WriteSimpleResponse(w, false, err.Error())
-				return
-			}
-
-			controllers.WriteSimpleResponse(w, true, "HTTP listen address set")
-			return
-		}
-
-		controllers.WriteSimpleResponse(w, false, "Invalid IP address")
-		return
-	}
-	controllers.WriteSimpleResponse(w, false, "Invalid type or value, IP address must be a string")
-}
-
-// SetRTMPServerPort will handle the web config request to set the inbound RTMP port.
-func SetRTMPServerPort(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetRTMPPortNumber(configValue.Value.(float64)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "rtmp port set")
-}
-
-// SetServerURL will handle the web config request to set the full server URL.
-func SetServerURL(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	rawValue, ok := configValue.Value.(string)
-	if !ok {
-		controllers.WriteSimpleResponse(w, false, "could not read server url")
-		return
-	}
-
-	serverHostString := utils.GetHostnameFromURLString(rawValue)
-	if serverHostString == "" {
-		controllers.WriteSimpleResponse(w, false, "server url value invalid")
-		return
-	}
-
-	// Trim any trailing slash
-	serverURL := strings.TrimRight(rawValue, "/")
-
-	if err := data.SetServerURL(serverURL); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "server url set")
-}
-
-// SetSocketHostOverride will set the host override for the websocket.
-func SetSocketHostOverride(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetWebsocketOverrideHost(configValue.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "websocket host override set")
-}
-
-// SetDirectoryEnabled will handle the web config request to enable or disable directory registration.
-func SetDirectoryEnabled(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetDirectoryEnabled(configValue.Value.(bool)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-	controllers.WriteSimpleResponse(w, true, "directory state changed")
-}
-
-// SetStreamLatencyLevel will handle the web config request to set the stream latency level.
-func SetStreamLatencyLevel(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		return
-	}
-
-	if err := data.SetStreamLatencyLevel(configValue.Value.(float64)); err != nil {
-		controllers.WriteSimpleResponse(w, false, "error setting stream latency "+err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "set stream latency")
-}
-
-// SetS3Configuration will handle the web config request to set the storage configuration.
-func SetS3Configuration(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	type s3ConfigurationRequest struct {
-		Value models.S3 `json:"value"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var newS3Config s3ConfigurationRequest
-	if err := decoder.Decode(&newS3Config); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update s3 config with provided values")
-		return
-	}
-
-	if newS3Config.Value.Enabled {
-		if newS3Config.Value.Endpoint == "" || !utils.IsValidURL((newS3Config.Value.Endpoint)) {
-			controllers.WriteSimpleResponse(w, false, "s3 support requires an endpoint")
-			return
-		}
-
-		if newS3Config.Value.AccessKey == "" || newS3Config.Value.Secret == "" {
-			controllers.WriteSimpleResponse(w, false, "s3 support requires an access key and secret")
-			return
-		}
-
-		if newS3Config.Value.Region == "" {
-			controllers.WriteSimpleResponse(w, false, "s3 support requires a region and endpoint")
-			return
-		}
-
-		if newS3Config.Value.Bucket == "" {
-			controllers.WriteSimpleResponse(w, false, "s3 support requires a bucket created for storing public video segments")
-			return
-		}
-	}
-
-	if err := data.SetS3Config(newS3Config.Value); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-	controllers.WriteSimpleResponse(w, true, "storage configuration changed")
-}
-
-// SetStreamOutputVariants will handle the web config request to set the video output stream variants.
-func SetStreamOutputVariants(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	type streamOutputVariantRequest struct {
-		Value []models.StreamOutputVariant `json:"value"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var videoVariants streamOutputVariantRequest
-	if err := decoder.Decode(&videoVariants); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update video config with provided values "+err.Error())
-		return
-	}
-
-	if err := data.SetStreamOutputVariants(videoVariants.Value); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update video config with provided values "+err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "stream output variants updated")
-}
-
-// SetSocialHandles will handle the web config request to set the external social profile links.
-func SetSocialHandles(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	type socialHandlesRequest struct {
-		Value []models.SocialHandle `json:"value"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var socialHandles socialHandlesRequest
-	if err := decoder.Decode(&socialHandles); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update social handles with provided values")
-		return
-	}
-
-	if err := data.SetSocialHandles(socialHandles.Value); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update social handles with provided values")
-		return
-	}
-
-	// Update Fediverse followers about this change.
-	if err := outbox.UpdateFollowersWithAccountUpdates(); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "social handles updated")
-}
-
-// SetChatDisabled will disable chat functionality.
-func SetChatDisabled(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 disabled")
-		return
-	}
-
-	if err := data.SetChatDisabled(configValue.Value.(bool)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "chat disabled status updated")
-}
-
-// SetVideoCodec will change the codec used for video encoding.
-func SetVideoCodec(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	configValue, success := getValueFromRequest(w, r)
-	if !success {
-		controllers.WriteSimpleResponse(w, false, "unable to change video codec")
-		return
-	}
-
-	if err := data.SetVideoCodec(configValue.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update codec")
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "video codec updated")
-}
-
-// SetExternalActions will set the 3rd party actions for the web interface.
-func SetExternalActions(w http.ResponseWriter, r *http.Request) {
-	type externalActionsRequest struct {
-		Value []models.ExternalAction `json:"value"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var actions externalActionsRequest
-	if err := decoder.Decode(&actions); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update external actions with provided values")
-		return
-	}
-
-	if err := data.SetExternalActions(actions.Value); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update external actions with provided values")
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "external actions update")
-}
-
-// SetCustomStyles will set the CSS string we insert into the page.
-func SetCustomStyles(w http.ResponseWriter, r *http.Request) {
-	customStyles, success := getValueFromRequest(w, r)
-	if !success {
-		controllers.WriteSimpleResponse(w, false, "unable to update custom styles")
-		return
-	}
-
-	if err := data.SetCustomStyles(customStyles.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "custom styles updated")
-}
-
-// SetCustomJavascript will set the Javascript string we insert into the page.
-func SetCustomJavascript(w http.ResponseWriter, r *http.Request) {
-	customJavascript, success := getValueFromRequest(w, r)
-	if !success {
-		controllers.WriteSimpleResponse(w, false, "unable to update custom javascript")
-		return
-	}
-
-	if err := data.SetCustomJavascript(customJavascript.Value.(string)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "custom styles updated")
-}
-
-// SetForbiddenUsernameList will set the list of usernames we do not allow to use.
-func SetForbiddenUsernameList(w http.ResponseWriter, r *http.Request) {
-	type forbiddenUsernameListRequest struct {
-		Value []string `json:"value"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var request forbiddenUsernameListRequest
-	if err := decoder.Decode(&request); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update forbidden usernames with provided values")
-		return
-	}
-
-	if err := data.SetForbiddenUsernameList(request.Value); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "forbidden username list updated")
-}
-
-// SetSuggestedUsernameList will set the list of suggested usernames that newly registered users are assigned if it isn't inferred otherwise (i.e. through a proxy).
-func SetSuggestedUsernameList(w http.ResponseWriter, r *http.Request) {
-	type suggestedUsernameListRequest struct {
-		Value []string `json:"value"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var request suggestedUsernameListRequest
-
-	if err := decoder.Decode(&request); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update suggested usernames with provided values")
-		return
-	}
-
-	if err := data.SetSuggestedUsernamesList(request.Value); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "suggested username list updated")
-}
-
-// SetChatJoinMessagesEnabled will enable or disable the chat join messages.
-func SetChatJoinMessagesEnabled(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 join messages enabled")
-		return
-	}
-
-	if err := data.SetChatJoinMessagesEnabled(configValue.Value.(bool)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "chat join message status updated")
-}
-
-// SetHideViewerCount will enable or disable hiding the viewer count.
-func SetHideViewerCount(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 hiding viewer count")
-		return
-	}
-
-	if err := data.SetHideViewerCount(configValue.Value.(bool)); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "hide viewer count setting updated")
-}
-
-func requirePOST(w http.ResponseWriter, r *http.Request) bool {
-	if r.Method != controllers.POST {
-		controllers.WriteSimpleResponse(w, false, r.Method+" not supported")
-		return false
-	}
-
-	return true
-}
-
-func getValueFromRequest(w http.ResponseWriter, r *http.Request) (ConfigValue, bool) {
-	decoder := json.NewDecoder(r.Body)
-	var configValue ConfigValue
-	if err := decoder.Decode(&configValue); err != nil {
-		log.Warnln(err)
-		controllers.WriteSimpleResponse(w, false, "unable to parse new value")
-		return configValue, false
-	}
-
-	return configValue, true
-}
-
-func getValuesFromRequest(w http.ResponseWriter, r *http.Request) ([]ConfigValue, bool) {
-	var values []ConfigValue
-
-	decoder := json.NewDecoder(r.Body)
-	var configValue ConfigValue
-	if err := decoder.Decode(&configValue); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to parse array of values")
-		return values, false
-	}
-
-	object := reflect.ValueOf(configValue.Value)
-
-	for i := 0; i < object.Len(); i++ {
-		values = append(values, ConfigValue{Value: object.Index(i).Interface()})
-	}
-
-	return values, true
-}
-
-// SetStreamKeys will set the valid stream keys.
-func SetStreamKeys(w http.ResponseWriter, r *http.Request) {
-	if !requirePOST(w, r) {
-		return
-	}
-
-	type streamKeysRequest struct {
-		Value []models.StreamKey `json:"value"`
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var streamKeys streamKeysRequest
-	if err := decoder.Decode(&streamKeys); err != nil {
-		controllers.WriteSimpleResponse(w, false, "unable to update stream keys with provided values")
-		return
-	}
-
-	if err := data.SetStreamKeys(streamKeys.Value); err != nil {
-		controllers.WriteSimpleResponse(w, false, err.Error())
-		return
-	}
-
-	controllers.WriteSimpleResponse(w, true, "changed")
-}

controllers/admin/externalAPIUsers.go

@@ -1,103 +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,166 +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.GetChatJoinMessagesEnabled(),
-		SocketHostOverride:      data.GetWebsocketOverrideHost(),
-		ChatEstablishedUserMode: data.GetChatEstbalishedUsersOnlyMode(),
-		HideViewerCount:         data.GetHideViewerCount(),
-		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"`
-	FFmpegPath              string                      `json:"ffmpegPath"`
-	AdminPassword           string                      `json:"adminPassword"`
-	StreamKeys              []models.StreamKey          `json:"streamKeys"`
-	StreamKeyOverridden     bool                        `json:"streamKeyOverridden"`
-	WebServerPort           int                         `json:"webServerPort"`
-	WebServerIP             string                      `json:"webServerIP"`
-	RTMPServerPort          int                         `json:"rtmpServerPort"`
-	S3                      models.S3                   `json:"s3"`
-	VideoSettings           videoSettings               `json:"videoSettings"`
-	YP                      yp                          `json:"yp"`
-	ChatDisabled            bool                        `json:"chatDisabled"`
-	ChatJoinMessagesEnabled bool                        `json:"chatJoinMessagesEnabled"`
-	ChatEstablishedUserMode bool                        `json:"chatEstablishedUserMode"`
-	ExternalActions         []models.ExternalAction     `json:"externalActions"`
-	SupportedCodecs         []string                    `json:"supportedCodecs"`
-	VideoCodec              string                      `json:"videoCodec"`
-	ForbiddenUsernames      []string                    `json:"forbiddenUsernames"`
-	Federation              federationConfigResponse    `json:"federation"`
-	SuggestedUsernames      []string                    `json:"suggestedUsernames"`
-	SocketHostOverride      string                      `json:"socketHostOverride,omitempty"`
-	Notifications           notificationsConfigResponse `json:"notifications"`
-	HideViewerCount         bool                        `json:"hideViewerCount"`
-}
-
-type videoSettings struct {
-	VideoQualityVariants []models.StreamOutputVariant `json:"videoQualityVariants"`
-	LatencyLevel         int                          `json:"latencyLevel"`
-}
-
-type webConfigResponse struct {
-	Name                string                `json:"name"`
-	Summary             string                `json:"summary"`
-	WelcomeMessage      string                `json:"welcomeMessage"`
-	OfflineMessage      string                `json:"offlineMessage"`
-	Logo                string                `json:"logo"`
-	Tags                []string              `json:"tags"`
-	Version             string                `json:"version"`
-	NSFW                bool                  `json:"nsfw"`
-	ExtraPageContent    string                `json:"extraPageContent"`
-	StreamTitle         string                `json:"streamTitle"` // What's going on with the current stream
-	SocialHandles       []models.SocialHandle `json:"socialHandles"`
-	CustomStyles        string                `json:"customStyles"`
-	CustomJavascript    string                `json:"customJavascript"`
-	AppearanceVariables map[string]string     `json:"appearanceVariables"`
-}
-
-type yp struct {
-	Enabled      bool   `json:"enabled"`
-	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)
-}
-
-type federationConfigResponse struct {
-	Enabled        bool     `json:"enabled"`
-	IsPrivate      bool     `json:"isPrivate"`
-	Username       string   `json:"username"`
-	GoLiveMessage  string   `json:"goLiveMessage"`
-	ShowEngagement bool     `json:"showEngagement"`
-	BlockedDomains []string `json:"blockedDomains"`
-}
-
-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,98 +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 {
-		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 {
-	Name                 string                       `json:"name"`
-	Summary              string                       `json:"summary"`
-	OfflineMessage       string                       `json:"offlineMessage"`
-	Logo                 string                       `json:"logo"`
-	Tags                 []string                     `json:"tags"`
-	Version              string                       `json:"version"`
-	NSFW                 bool                         `json:"nsfw"`
-	SocketHostOverride   string                       `json:"socketHostOverride,omitempty"`
-	ExtraPageContent     string                       `json:"extraPageContent"`
-	StreamTitle          string                       `json:"streamTitle,omitempty"` // What's going on with the current stream
-	SocialHandles        []models.SocialHandle        `json:"socialHandles"`
-	ChatDisabled         bool                         `json:"chatDisabled"`
-	ExternalActions      []models.ExternalAction      `json:"externalActions"`
-	CustomStyles         string                       `json:"customStyles"`
-	AppearanceVariables  map[string]string            `json:"appearanceVariables"`
-	MaxSocketPayloadSize int                          `json:"maxSocketPayloadSize"`
-	Federation           federationConfigResponse     `json:"federation"`
-	Notifications        notificationsConfigResponse  `json:"notifications"`
-	Authentication       authenticationConfigResponse `json:"authentication"`
-	HideViewerCount      bool                         `json:"hideViewerCount"`
-}
-
-type federationConfigResponse struct {
-	Enabled       bool   `json:"enabled"`
-	Account       string `json:"account,omitempty"`
-	FollowerCount int    `json:"followerCount,omitempty"`
-}
-
-type browserNotificationsConfigResponse struct {
-	Enabled   bool   `json:"enabled"`
-	PublicKey string `json:"publicKey,omitempty"`
-}
-
-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/index.go

@@ -1,93 +0,0 @@
-package controllers
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"path/filepath"
-	"strings"
-
-	"github.com/owncast/owncast/core/data"
-	"github.com/owncast/owncast/router/middleware"
-	"github.com/owncast/owncast/static"
-	"github.com/owncast/owncast/utils"
-)
-
-// IndexHandler handles the default index route.
-func IndexHandler(w http.ResponseWriter, r *http.Request) {
-	middleware.EnableCors(w)
-
-	isIndexRequest := r.URL.Path == "/" || filepath.Base(r.URL.Path) == "index.html" || filepath.Base(r.URL.Path) == ""
-
-	if utils.IsUserAgentAPlayer(r.UserAgent()) && isIndexRequest {
-		http.Redirect(w, r, "/hls/stream.m3u8", http.StatusTemporaryRedirect)
-		return
-	}
-
-	// Set a cache control max-age header
-	middleware.SetCachingHeaders(w, r)
-
-	nonceRandom, _ := utils.GenerateRandomString(5)
-
-	// Set our global HTTP headers
-	middleware.SetHeaders(w, fmt.Sprintf("nonce-%s", nonceRandom))
-
-	if isIndexRequest {
-		renderIndexHtml(w, nonceRandom)
-		return
-	}
-
-	serveWeb(w, r)
-}
-
-func renderIndexHtml(w http.ResponseWriter, nonce string) {
-	type serverSideContent struct {
-		Name             string
-		Summary          string
-		RequestedURL     string
-		TagsString       string
-		ThumbnailURL     string
-		Thumbnail        string
-		Image            string
-		StatusJSON       string
-		ServerConfigJSON string
-		Nonce            string
-	}
-
-	status := getStatusResponse()
-	sb, err := json.Marshal(status)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	config := getConfigResponse()
-	cb, err := json.Marshal(config)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	content := serverSideContent{
-		Name:             data.GetServerName(),
-		Summary:          data.GetServerSummary(),
-		RequestedURL:     data.GetServerURL(),
-		TagsString:       strings.Join(data.GetServerMetadataTags(), ","),
-		ThumbnailURL:     "/thumbnail.jpg",
-		Thumbnail:        "/thumbnail.jpg",
-		Image:            "/logo/external",
-		StatusJSON:       string(sb),
-		ServerConfigJSON: string(cb),
-		Nonce:            nonce,
-	}
-
-	index, err := static.GetWebIndexTemplate()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	if err := index.Execute(w, content); err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-	}
-}

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,33 +13,35 @@ 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 {
-	mu          sync.RWMutex
-	Id          uint `json:"-"`
-	accessToken string
-	conn        *websocket.Conn
-	User        *user.User `json:"user"`
-	server      *Server
-	IPAddress   string `json:"-"`
+	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
-	rateLimiter  *rate.Limiter
-	timeoutTimer *time.Timer
+	accessToken  string
+	IPAddress    string `json:"-"`
+	UserAgent    string `json:"userAgent"`
+	MessageCount int    `json:"messageCount"`
+	Id           uint   `json:"-"`
+	mu           sync.RWMutex
 	inTimeout    bool
-	Geo          *geoip.GeoDetails `json:"geo"`
-	MessageCount int               `json:"messageCount"`
-	UserAgent    string            `json:"userAgent"`
-	ConnectedAt  time.Time         `json:"connectedAt"`
 }
 
 type chatClientEvent struct {
-	data   []byte
 	client *Client
+	data   []byte
 }
 
 const (
@@ -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,11 +64,17 @@ 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.
+	if proposedUsername == oldName {
+		eventData.client.sendConnectedClientInfo()
+		return
+	}
+
 	// 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)
 	}
 
@@ -97,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)
@@ -110,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)
 	}
 
@@ -120,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)
@@ -142,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 {
@@ -161,7 +175,6 @@ func (s *Server) userMessageSent(eventData chatClientEvent) {
 
 	SaveUserMessage(event)
 	eventData.client.MessageCount++
-	_lastSeenCache[event.User.ID] = time.Now()
 }
 
 func logSanitize(userValue string) string {

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 *models.User `json:"user"`
 	Event
-	User *user.User `json:"user"`
 }

core/chat/events/events.go

@@ -4,16 +4,23 @@ import (
 	"bytes"
 	"regexp"
 	"strings"
+	"sync"
+	"text/template"
 	"time"
 
 	"github.com/microcosm-cc/bluemonday"
 	"github.com/teris-io/shortid"
 	"github.com/yuin/goldmark"
+	emoji "github.com/yuin/goldmark-emoji"
+	emojiAst "github.com/yuin/goldmark-emoji/ast"
+	emojiDef "github.com/yuin/goldmark-emoji/definition"
 	"github.com/yuin/goldmark/extension"
 	"github.com/yuin/goldmark/renderer/html"
-	"mvdan.cc/xurls"
+	"github.com/yuin/goldmark/util"
+	"mvdan.cc/xurls/v2"
 
-	"github.com/owncast/owncast/core/user"
+	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/models"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -23,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 {
-	Type      EventType `json:"type,omitempty"`
-	ID        string    `json:"id"`
-	Timestamp time.Time `json:"timestamp"`
+	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"`
-	ClientID uint       `json:"clientId,omitempty"`
-	HiddenAt *time.Time `json:"hiddenAt,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.
@@ -66,6 +73,105 @@ func (e *UserMessageEvent) SetDefaults() {
 	e.RenderAndSanitizeMessageBody()
 }
 
+// implements the emojiDef.Emojis interface but uses case-insensitive search.
+// the .children field isn't currently used, but could be used in a future
+// implementation of say, emoji packs where a child represents a pack.
+type emojis struct {
+	list     []emojiDef.Emoji
+	names    map[string]*emojiDef.Emoji
+	children []emojiDef.Emojis
+}
+
+// return a new Emojis set.
+func newEmojis(emotes ...emojiDef.Emoji) emojiDef.Emojis {
+	self := &emojis{
+		list:     emotes,
+		names:    map[string]*emojiDef.Emoji{},
+		children: []emojiDef.Emojis{},
+	}
+
+	for i := range self.list {
+		emoji := &self.list[i]
+		for _, s := range emoji.ShortNames {
+			self.names[s] = emoji
+		}
+	}
+
+	return self
+}
+
+func (self *emojis) Get(shortName string) (*emojiDef.Emoji, bool) {
+	v, ok := self.names[strings.ToLower(shortName)]
+	if ok {
+		return v, ok
+	}
+
+	for _, child := range self.children {
+		v, ok := child.Get(shortName)
+		if ok {
+			return v, ok
+		}
+	}
+
+	return nil, false
+}
+
+func (self *emojis) Add(emotes emojiDef.Emojis) {
+	self.children = append(self.children, emotes)
+}
+
+func (self *emojis) Clone() emojiDef.Emojis {
+	clone := &emojis{
+		list:     self.list,
+		names:    self.names,
+		children: make([]emojiDef.Emojis, len(self.children)),
+	}
+
+	copy(clone.children, self.children)
+
+	return clone
+}
+
+var (
+	emojiMu           sync.Mutex
+	emojiDefs         = newEmojis()
+	emojiHTML         = make(map[string]string)
+	emojiModTime      time.Time
+	emojiHTMLFormat   = `<img src="{{ .URL }}" class="emoji" alt=":{{ .Name }}:" title=":{{ .Name }}:">`
+	emojiHTMLTemplate = template.Must(template.New("emojiHTML").Parse(emojiHTMLFormat))
+)
+
+func loadEmoji() {
+	modTime, err := data.UpdateEmojiList(false)
+	if err != nil {
+		return
+	}
+
+	if modTime.After(emojiModTime) {
+		emojiMu.Lock()
+		defer emojiMu.Unlock()
+
+		emojiHTML = make(map[string]string)
+
+		emojiList := data.GetEmojiList()
+		emojiArr := make([]emojiDef.Emoji, 0)
+
+		for i := 0; i < len(emojiList); i++ {
+			var buf bytes.Buffer
+			err := emojiHTMLTemplate.Execute(&buf, emojiList[i])
+			if err != nil {
+				return
+			}
+			emojiHTML[strings.ToLower(emojiList[i].Name)] = buf.String()
+
+			emoji := emojiDef.NewEmoji(emojiList[i].Name, nil, strings.ToLower(emojiList[i].Name))
+			emojiArr = append(emojiArr, emoji)
+		}
+
+		emojiDefs = newEmojis(emojiArr...)
+	}
+}
+
 // RenderAndSanitizeMessageBody will turn markdown into HTML, sanitize raw user-supplied HTML and standardize
 // the message into something safe and renderable for clients.
 func (m *MessageEvent) RenderAndSanitizeMessageBody() {
@@ -98,6 +204,11 @@ func RenderAndSanitize(raw string) string {
 
 // RenderMarkdown will return HTML rendered from the string body of a chat message.
 func RenderMarkdown(raw string) string {
+	loadEmoji()
+
+	emojiMu.Lock()
+	defer emojiMu.Unlock()
+
 	markdown := goldmark.New(
 		goldmark.WithRendererOptions(
 			html.WithUnsafe(),
@@ -109,9 +220,19 @@ func RenderMarkdown(raw string) string {
 					[]byte("https:"),
 				}),
 				extension.WithLinkifyURLRegexp(
-					xurls.Strict,
+					xurls.Strict(),
 				),
 			),
+			emoji.New(
+				emoji.WithEmojis(
+					emojiDefs,
+				),
+				emoji.WithRenderingMethod(emoji.Func),
+				emoji.WithRendererFunc(func(w util.BufWriter, source []byte, n *emojiAst.Emoji, config *emoji.RendererConfig) {
+					baseName := n.Value.ShortNames[0]
+					_, _ = w.WriteString(emojiHTML[baseName])
+				}),
+			),
 		),
 	)
 
@@ -125,9 +246,9 @@ func RenderMarkdown(raw string) string {
 }
 
 var (
-	_sanitizeReSrcMatch      = regexp.MustCompile(`(?i)^/img/emoji/[^\.%]*.[A-Z]*$`)
-	_sanitizeReAltTitleMatch = regexp.MustCompile(`:\S+:`)
-	_sanitizeReClassMatch    = regexp.MustCompile(`(?i)^(emoji)[A-Z_]*?$`)
+	_sanitizeReSrcMatch    = regexp.MustCompile(`(?i)^/img/emoji/[^\.%]*.[A-Z]*$`)
+	_sanitizeReClassMatch  = regexp.MustCompile(`(?i)^(emoji)[A-Z_]*?$`)
+	_sanitizeNonEmptyMatch = regexp.MustCompile(`^.+$`)
 )
 
 func sanitize(raw string) string {
@@ -149,11 +270,11 @@ func sanitize(raw string) string {
 	// Allow breaks
 	p.AllowElements("br")
 
-	p.AllowElementsContent("p")
+	p.AllowElements("p")
 
 	// Allow img tags from the the local emoji directory only
 	p.AllowAttrs("src").Matching(_sanitizeReSrcMatch).OnElements("img")
-	p.AllowAttrs("alt", "title").Matching(_sanitizeReAltTitleMatch).OnElements("img")
+	p.AllowAttrs("alt", "title").Matching(_sanitizeNonEmptyMatch).OnElements("img")
 	p.AllowAttrs("class").Matching(_sanitizeReClassMatch).OnElements("img")
 
 	// Allow bold