allow 30 char usernames

.circleci/config.yml

@@ -21,12 +21,7 @@ jobs:
     steps:
       - checkout
 
-      - run:
-          name: "Create Environment file and generate app key"
-          command: |
-            mv .env.testing .env
-
-      - run: sudo apt install zlib1g-dev libsqlite3-dev
+      - run: sudo apt update && sudo apt install zlib1g-dev libsqlite3-dev
 
       # Download and cache dependencies
 
@@ -41,17 +36,18 @@ jobs:
       - run: composer install -n --prefer-dist
 
       - save_cache:
-          key: v2-dependencies-{{ checksum "composer.json" }}
+          key: composer-v2-{{ checksum "composer.lock" }}
           paths:
             - vendor
 
+      - run: cp .env.testing .env
       - run: php artisan config:cache
       - run: php artisan route:clear
       - run: php artisan storage:link
       - run: php artisan key:generate
 
       # run tests with phpunit or codecept
-      - run: php artisan test
+      - run: ./vendor/bin/phpunit
       - store_test_results:
           path: tests/_output
       - store_artifacts:

.ddev/commands/redis/redis-cli

@@ -4,4 +4,4 @@
 ## Usage: redis-cli [flags] [args]
 ## Example: "redis-cli KEYS *" or "ddev redis-cli INFO" or "ddev redis-cli --version"
 
-exec redis-cli -p 6379 -h redis "$@"
+redis-cli -p 6379 -h redis $@

.dockerignore

@@ -1,30 +1,8 @@
-.DS_Store
-/.bash_history
-/.bash_profile
-/.bashrc
-/.composer
-/.env
-/.env.dottie-backup
-/.git
-/.git-credentials
-/.gitconfig
-/.gitignore
-/.idea
-/.vagrant
-/bootstrap/cache
-/docker-compose-state/
-/Homestead.json
-/Homestead.yaml
-/node_modules
-/npm-debug.log
-/public/hot
-/public/storage
-/public/vendor/horizon
-/storage/*.key
-/storage/docker
-/vendor
-/yarn-error.log
-
-# Exceptions - these *MUST* be last
-!/bootstrap/cache/.gitignore
-!/public/vendor/horizon/.gitignore
+data
+Dockerfile
+contrib/docker/Dockerfile.*
+docker-compose*.yml
+.dockerignore
+.git
+.gitignore
+.env

.editorconfig

@@ -1,27 +1,9 @@
 root = true
 
 [*]
-indent_style = space
 indent_size = 4
+indent_style = tab
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-[*.{yml,yaml}]
-indent_style = space
-indent_size = 2
-
-[*.{sh,envsh,env,env*}]
-indent_style = space
-indent_size = 4
-
-# ShellCheck config
-shell_variant      = bash  # like -ln=bash
-binary_next_line   = true  # like -bn
-switch_case_indent = true  # like -ci
-space_redirects    = false # like -sr
-keep_padding       = false # like -kp
-function_next_line = true  # like -fn
-never_split        = true  # like -ns
-simplify           = true

.env.testing

@@ -1,5 +1,3 @@
-# shellcheck disable=SC2034,SC2148
-
 APP_NAME="Pixelfed Test"
 APP_ENV=local
 APP_KEY=base64:lwX95GbNWX3XsucdMe0XwtOKECta3h/B+p9NbH2jd0E=
@@ -64,8 +62,8 @@ CS_BLOCKED_DOMAINS='example.org,example.net,example.com'
 CS_CW_DOMAINS='example.org,example.net,example.com'
 CS_UNLISTED_DOMAINS='example.org,example.net,example.com'
 
-## Optional
+## Optional 
 #HORIZON_DARKMODE=false  # Horizon theme darkmode
-#HORIZON_EMBED=false  # Single Docker Container mode
+#HORIZON_EMBED=false  # Single Docker Container mode 
 
 ENABLE_CONFIG_CACHE=false

.gitattributes

@@ -3,10 +3,3 @@
 *.scss linguist-vendored
 *.js linguist-vendored
 CHANGELOG.md export-ignore
-
-# Collapse diffs for generated files:
-public/**/*.js text -diff
-public/**/*.json text -diff
-public/**/*.css text -diff
-public/img/* binary -diff
-public/fonts/* binary -diff

.github/workflows/build-docker.yml

@@ -0,0 +1,125 @@
+---
+name: Build Docker image
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - dev
+    tags:
+      - '*'
+  pull_request:
+    paths:
+      - .github/workflows/build-docker.yml
+      - contrib/docker/Dockerfile.apache
+      - contrib/docker/Dockerfile.fpm
+permissions:
+  contents: read
+
+jobs:
+  build-docker-apache:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Docker Lint
+        uses: hadolint/hadolint-action@v3.0.0
+        with:
+          dockerfile: contrib/docker/Dockerfile.apache
+          failure-threshold: error
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        secrets: inherit
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+        if: github.event_name != 'pull_request'
+
+      - name: Fetch tags
+        uses: docker/metadata-action@v4
+        secrets: inherit
+        id: meta
+        with:
+          images: ${{ secrets.DOCKER_HUB_ORGANISATION }}/pixelfed
+          flavor: |
+            latest=auto
+            suffix=-apache
+          tags: |
+            type=edge,branch=dev
+            type=pep440,pattern={{raw}}
+            type=pep440,pattern=v{{major}}.{{minor}}
+            type=ref,event=pr
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: contrib/docker/Dockerfile.apache
+          platforms: linux/amd64,linux/arm64
+          builder: ${{ steps.buildx.outputs.name }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  build-docker-fpm:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Docker Lint
+        uses: hadolint/hadolint-action@v3.0.0
+        with:
+          dockerfile: contrib/docker/Dockerfile.fpm
+          failure-threshold: error
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        secrets: inherit
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+        if: github.event_name != 'pull_request'
+
+      - name: Fetch tags
+        uses: docker/metadata-action@v4
+        secrets: inherit
+        id: meta
+        with:
+          images: ${{ secrets.DOCKER_HUB_ORGANISATION }}/pixelfed
+          flavor: |
+            suffix=-fpm
+          tags: |
+            type=edge,branch=dev
+            type=pep440,pattern={{raw}}
+            type=pep440,pattern=v{{major}}.{{minor}}
+            type=ref,event=pr
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: contrib/docker/Dockerfile.fpm
+          platforms: linux/amd64,linux/arm64
+          builder: ${{ steps.buildx.outputs.name }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/docker.yml

@@ -1,230 +0,0 @@
----
-name: Docker
-
-on:
-  # See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
-  workflow_dispatch:
-
-  # See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#push
-  push:
-    branches:
-      - dev
-      - staging
-    tags:
-      - "*"
-
-  # See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-
-jobs:
-  lint:
-    name: hadolint
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Docker Lint
-        uses: hadolint/hadolint-action@v3.1.0
-        with:
-          dockerfile: Dockerfile
-          failure-threshold: error
-
-  shellcheck:
-    name: ShellCheck
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
-        env:
-          SHELLCHECK_OPTS: --shell=bash --external-sources
-        with:
-          version: v0.9.0
-          additional_files: "*.envsh .env .env.docker .env.example .env.testing"
-
-  bats:
-    name: Bats Testing
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run bats
-        run: docker run -v "$PWD:/var/www" bats/bats:latest /var/www/tests/bats
-
-  build:
-    name: Build, Test, and Push
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-
-      # See: https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
-      matrix:
-        php_version:
-          - 8.2
-          - 8.3
-        target_runtime:
-          - apache
-          - fpm
-          - nginx
-        php_base:
-          - apache
-          - fpm
-
-        # See: https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#excluding-matrix-configurations
-        # See: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrixexclude
-        exclude:
-          # targeting [apache] runtime with [fpm] base type doesn't make sense
-          - target_runtime: apache
-            php_base: fpm
-
-          # targeting [fpm] runtime with [apache] base type doesn't make sense
-          - target_runtime: fpm
-            php_base: apache
-
-          # targeting [nginx] runtime with [apache] base type doesn't make sense
-          - target_runtime: nginx
-            php_base: apache
-
-    # See: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-using-concurrency-and-the-default-behavior
-    concurrency:
-      group: docker-build-${{ github.ref }}-${{ matrix.php_base }}-${{ matrix.php_version }}-${{ matrix.target_runtime }}
-      cancel-in-progress: true
-
-    permissions:
-      contents: read
-      packages: write
-
-    env:
-      # Set the repo variable [DOCKER_HUB_USERNAME] to override the default
-      # at https://github.com/<user>/<project>/settings/variables/actions
-      DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME || 'pixelfed' }}
-
-      # Set the repo variable [DOCKER_HUB_ORGANISATION] to override the default
-      # at https://github.com/<user>/<project>/settings/variables/actions
-      DOCKER_HUB_ORGANISATION: ${{ vars.DOCKER_HUB_ORGANISATION || 'pixelfed' }}
-
-      # Set the repo variable [DOCKER_HUB_REPO] to override the default
-      # at https://github.com/<user>/<project>/settings/variables/actions
-      DOCKER_HUB_REPO: ${{ vars.DOCKER_HUB_REPO || 'pixelfed' }}
-
-      # For Docker Hub pushing to work, you need the secret [DOCKER_HUB_TOKEN]
-      # set to your Personal Access Token at https://github.com/<user>/<project>/settings/secrets/actions
-      #
-      # ! NOTE: no [login] or [push] will happen to Docker Hub until this secret is set!
-      HAS_DOCKER_HUB_CONFIGURED: ${{ secrets.DOCKER_HUB_TOKEN != '' }}
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        id: buildx
-        with:
-          version: v0.12.0 # *or* newer, needed for annotations to work
-
-        # See: https://github.com/docker/login-action?tab=readme-ov-file#github-container-registry
-      - name: Log in to the GitHub Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-        # See: https://github.com/docker/login-action?tab=readme-ov-file#docker-hub
-      - name: Login to Docker Hub registry (conditionally)
-        if: ${{ env.HAS_DOCKER_HUB_CONFIGURED == true }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ env.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-      - name: Docker meta
-        uses: docker/metadata-action@v5
-        id: meta
-        with:
-          images: |
-            name=ghcr.io/${{ github.repository }},enable=true
-            name=${{ env.DOCKER_HUB_ORGANISATION }}/${{ env.DOCKER_HUB_REPO }},enable=${{ env.HAS_DOCKER_HUB_CONFIGURED }}
-          flavor: |
-            latest=auto
-            suffix=-${{ matrix.target_runtime }}-${{ matrix.php_version }}
-          tags: |
-            type=raw,value=dev,enable=${{ github.ref == format('refs/heads/{0}', 'dev') }}
-            type=raw,value=staging,enable=${{ github.ref == format('refs/heads/{0}', 'staging') }}
-            type=pep440,pattern={{raw}}
-            type=pep440,pattern=v{{major}}.{{minor}}
-            type=ref,event=branch,prefix=branch-
-            type=ref,event=pr,prefix=pr-
-            type=ref,event=tag
-        env:
-          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
-
-      - name: Docker meta (Cache)
-        uses: docker/metadata-action@v5
-        id: cache
-        with:
-          images: |
-            name=ghcr.io/${{ github.repository }}-cache,enable=true
-            name=${{ env.DOCKER_HUB_ORGANISATION }}/${{ env.DOCKER_HUB_REPO }}-cache,enable=${{ env.HAS_DOCKER_HUB_CONFIGURED }}
-          flavor: |
-            latest=auto
-            suffix=-${{ matrix.target_runtime }}-${{ matrix.php_version }}
-          tags: |
-            type=raw,value=dev,enable=${{ github.ref == format('refs/heads/{0}', 'dev') }}
-            type=raw,value=staging,enable=${{ github.ref == format('refs/heads/{0}', 'staging') }}
-            type=pep440,pattern={{raw}}
-            type=pep440,pattern=v{{major}}.{{minor}}
-            type=ref,event=branch,prefix=branch-
-            type=ref,event=pr,prefix=pr-
-            type=ref,event=tag
-        env:
-          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: Dockerfile
-          target: ${{ matrix.target_runtime }}-runtime
-          platforms: linux/amd64,linux/arm64
-          builder: ${{ steps.buildx.outputs.name }}
-          tags: ${{ steps.meta.outputs.tags }}
-          annotations: ${{ steps.meta.outputs.annotations }}
-          push: true
-          sbom: true
-          provenance: true
-          build-args: |
-            PHP_VERSION=${{ matrix.php_version }}
-            PHP_BASE_TYPE=${{ matrix.php_base }}
-          cache-from: |
-            type=gha,scope=${{ matrix.target_runtime }}-${{ matrix.php_base }}-${{ matrix.php_version }}
-          cache-to: |
-            type=gha,mode=max,scope=${{ matrix.target_runtime }}-${{ matrix.php_base }}-${{ matrix.php_version }}
-            ${{ steps.cache.outputs.tags }}
-
-      # goss validate the image
-      #
-      # See: https://github.com/goss-org/goss
-      - uses: e1himself/goss-installation-action@v1
-        with:
-          version: "v0.4.4"
-      - name: Execute Goss tests
-        run: |
-          dgoss run \
-            -v "./.env.testing:/var/www/.env" \
-            -e "EXPECTED_PHP_VERSION=${{ matrix.php_version }}" \
-            -e "PHP_BASE_TYPE=${{ matrix.php_base }}" \
-            ${{ steps.meta.outputs.tags }}

.gitignore

@@ -1,31 +1,22 @@
-.DS_Store
-/.bash_history
-/.bash_profile
-/.bashrc
-/.composer
-/.env
-/.env.dottie-backup
-#/.git
-/.git-credentials
-/.gitconfig
-#/.gitignore
-/.idea
-/.vagrant
-/bootstrap/cache
-/docker-compose-state/
-/Homestead.json
-/Homestead.yaml
 /node_modules
-/npm-debug.log
 /public/hot
 /public/storage
-/public/vendor/horizon
 /storage/*.key
-/storage/docker
 /vendor
-/yarn-error.log
-/public/build
-
-# Exceptions - these *MUST* be last
-!/bootstrap/cache/.gitignore
-!/public/vendor/horizon/.gitignore
+/.idea
+/.vscode
+/.vagrant
+/docker-volumes
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+.env
+.DS_Store
+.bash_profile
+.bash_history
+.bashrc
+.gitconfig
+.git-credentials
+/.composer/
+/nginx.conf

.hadolint.yaml

@@ -1,5 +0,0 @@
-ignored:
-  - DL3002 # warning: Last USER should not be root
-  - DL3008 # warning: Pin versions in apt get install. Instead of `apt-get install <package>` use `apt-get install <package>=<version>`
-  - SC2046 # warning: Quote this to prevent word splitting.
-  - SC2086 # info: Double quote to prevent globbing and word splitting.

.markdownlint.json

@@ -1,4 +0,0 @@
-{
-    "MD013": false,
-    "MD014": false
-}

.shellcheckrc

@@ -1,12 +0,0 @@
-# See: https://github.com/koalaman/shellcheck/blob/master/shellcheck.1.md#rc-files
-
-source-path=SCRIPTDIR
-
-# Allow opening any 'source'd file, even if not specified as input
-external-sources=true
-
-# Turn on warnings for unquoted variables with safe values
-enable=quote-safe-variables
-
-# Turn on warnings for unassigned uppercase variables
-enable=check-unassigned-uppercase

.vscode/extensions.json

@@ -1,14 +0,0 @@
-{
-    "recommendations": [
-        "foxundermoon.shell-format",
-        "timonwong.shellcheck",
-        "jetmartin.bats",
-        "aaron-bond.better-comments",
-        "streetsidesoftware.code-spell-checker",
-        "editorconfig.editorconfig",
-        "github.vscode-github-actions",
-        "bmewburn.vscode-intelephense-client",
-        "redhat.vscode-yaml",
-        "ms-azuretools.vscode-docker"
-    ]
-}

.vscode/settings.json

@@ -1,21 +0,0 @@
-{
-    "shellformat.useEditorConfig": true,
-    "[shellscript]": {
-        "files.eol": "\n",
-        "editor.defaultFormatter": "foxundermoon.shell-format"
-    },
-    "[yaml]": {
-        "editor.defaultFormatter": "redhat.vscode-yaml"
-    },
-    "[dockercompose]": {
-        "editor.defaultFormatter": "redhat.vscode-yaml",
-        "editor.autoIndent": "advanced",
-    },
-    "yaml.schemas": {
-        "https://json.schemastore.org/composer": "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json"
-    },
-    "files.associations": {
-        ".env": "shellscript",
-        ".env.*": "shellscript"
-    }
-}

CHANGELOG.md

@@ -1,245 +1,10 @@
 # Release Notes
 
-## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.13...dev)
-
-### Updates
-
-- Update SoftwareUpdateService, add command to refresh latest versions ([632f2cb6](https://github.com/pixelfed/pixelfed/commit/632f2cb6))
-- Update Post.vue, fix cache bug ([3a27e637](https://github.com/pixelfed/pixelfed/commit/3a27e637))
-- Update StatusHashtagService, use more efficient cached count ([592c8412](https://github.com/pixelfed/pixelfed/commit/592c8412))
-- Update DiscoverController, handle discover hashtag redirects ([18382e8a](https://github.com/pixelfed/pixelfed/commit/18382e8a))
-- Update ApiV1Controller, use admin filter service ([94503a1c](https://github.com/pixelfed/pixelfed/commit/94503a1c))
-- Update SearchApiV2Service, use more efficient query ([cee618e8](https://github.com/pixelfed/pixelfed/commit/cee618e8))
-- Update Curated Onboarding view, fix concierge form ([15ad69f7](https://github.com/pixelfed/pixelfed/commit/15ad69f7))
-- Update AP Profile Transformer, add `suspended` attribute ([25f3fa06](https://github.com/pixelfed/pixelfed/commit/25f3fa06))
-- Update AP Profile Transformer, fix movedTo attribute ([63100fe9](https://github.com/pixelfed/pixelfed/commit/63100fe9))
-- Update AP Profile Transformer, fix suspended attributes ([2e5e68e4](https://github.com/pixelfed/pixelfed/commit/2e5e68e4))
-- Update PrivacySettings controller, add cache invalidation ([e742d595](https://github.com/pixelfed/pixelfed/commit/e742d595))
-- Update ProfileController, preserve deleted actor objects for federated account deletion and use more efficient account cache lookup ([853a729f](https://github.com/pixelfed/pixelfed/commit/853a729f))
-- Update SiteController, add curatedOnboarding method that gracefully falls back to open registration when applicable ([95199843](https://github.com/pixelfed/pixelfed/commit/95199843))
-- Update AP transformers, add DeleteActor activity ([bcce1df6](https://github.com/pixelfed/pixelfed/commit/bcce1df6))
-- Update commands, add user account delete cli command to federate account deletion ([4aa0e25f](https://github.com/pixelfed/pixelfed/commit/4aa0e25f))
-- Update web-api popular accounts route to its own method to remove the breaking oauth scope bug ([a4bc5ce3](https://github.com/pixelfed/pixelfed/commit/a4bc5ce3))
-- Update config cache ([5e4d4eff](https://github.com/pixelfed/pixelfed/commit/5e4d4eff))
-- Update Config, use config_cache ([7785a2da](https://github.com/pixelfed/pixelfed/commit/7785a2da))
-- Update ApiV1Dot1Controller, use config_cache for in-app registration ([b0cb4456](https://github.com/pixelfed/pixelfed/commit/b0cb4456))
-- Update captcha, use config_cache helper ([8a89e3c9](https://github.com/pixelfed/pixelfed/commit/8a89e3c9))
-- Update custom emoji, add config_cache support ([481314cd](https://github.com/pixelfed/pixelfed/commit/481314cd))
-- Update ProfileController, fix permalink redirect bug ([75081e60](https://github.com/pixelfed/pixelfed/commit/75081e60))
-- Update admin css, use font-display:swap for nucleo icons ([8a0c456e](https://github.com/pixelfed/pixelfed/commit/8a0c456e))
-- Update PixelfedDirectoryController, fix boolean cast bug ([f08aab22](https://github.com/pixelfed/pixelfed/commit/f08aab22))
-- Update PixelfedDirectoryController, use cached stats ([f2f2a809](https://github.com/pixelfed/pixelfed/commit/f2f2a809))
-- Update AdminDirectoryController, fix type casting ([ad506e90](https://github.com/pixelfed/pixelfed/commit/ad506e90))
-- Update image pipeline, use config_cache ([a72188a7](https://github.com/pixelfed/pixelfed/commit/a72188a7))
-- Update cloud storage, use config_cache ([665581d8](https://github.com/pixelfed/pixelfed/commit/665581d8))
-- Update pixelfed.max_album_length, use config_cache ([fecbe189](https://github.com/pixelfed/pixelfed/commit/fecbe189))
-- Update media_types, use config_cache ([d670de17](https://github.com/pixelfed/pixelfed/commit/d670de17))
-- Update landing settings, use config_cache ([40478f25](https://github.com/pixelfed/pixelfed/commit/40478f25))
-- Update activitypub setting, use config_cache ([5071aaf4](https://github.com/pixelfed/pixelfed/commit/5071aaf4))
-- Update oauth setting, use config_cache ([ce228f7f](https://github.com/pixelfed/pixelfed/commit/ce228f7f))
-- Update stories config, use config_cache ([d1adb109](https://github.com/pixelfed/pixelfed/commit/d1adb109))
-- Update ig import, use config_cache ([da0e0ffa](https://github.com/pixelfed/pixelfed/commit/da0e0ffa))
-- Update autospam config, use config_cache ([a76cb5f4](https://github.com/pixelfed/pixelfed/commit/a76cb5f4))
-- Update app.name config, use config_cache ([911446c0](https://github.com/pixelfed/pixelfed/commit/911446c0))
-- Update UserObserver, fix type casting ([949e9979](https://github.com/pixelfed/pixelfed/commit/949e9979))
-- Update user_filters, use config_cache ([6ce513f8](https://github.com/pixelfed/pixelfed/commit/6ce513f8))
-- Update filesystems config, add to config_cache ([087b2791](https://github.com/pixelfed/pixelfed/commit/087b2791))
-- Update web-admin routes, add setting api routes ([828a456f](https://github.com/pixelfed/pixelfed/commit/828a456f))
-- Update hashtag component ([cee979ed](https://github.com/pixelfed/pixelfed/commit/cee979ed))
-- Update AdminReadMore component, add .prevent to click action ([704e7b12](https://github.com/pixelfed/pixelfed/commit/704e7b12))
-- Update admin dashboard, add admin settings partials ([eb487123](https://github.com/pixelfed/pixelfed/commit/eb487123))
-- Update admin settings, refactor to vue component ([674e560f](https://github.com/pixelfed/pixelfed/commit/674e560f))
-- Update ConfigCacheService, encrypt keys at rest ([3628b462](https://github.com/pixelfed/pixelfed/commit/3628b462))
-- Update RemoteFollowImportRecent, use MediaPathService ([5162c070](https://github.com/pixelfed/pixelfed/commit/5162c070))
-- Update AdminSettingsController, add user filter max limit settings ([ac1f0748](https://github.com/pixelfed/pixelfed/commit/ac1f0748))
-- Update AdminSettingsController, add AdminSettingsService ([dcc5f416](https://github.com/pixelfed/pixelfed/commit/dcc5f416))
-- Update AdminSettings component, fix user settings ([aba1e13d](https://github.com/pixelfed/pixelfed/commit/aba1e13d))
-- Update AdminInstances component ([ec2fdd61](https://github.com/pixelfed/pixelfed/commit/ec2fdd61))
-- Update AdminSettings, add max_account_size support ([2dcbc1d5](https://github.com/pixelfed/pixelfed/commit/2dcbc1d5))
-- Update AdminSettings, use better validation for user integer settings ([d946afcc](https://github.com/pixelfed/pixelfed/commit/d946afcc))
-- Update spa sass, fix timestamp dark mode bug ([4147f7c5](https://github.com/pixelfed/pixelfed/commit/4147f7c5))
-- Update relationships view, fix unfollow hashtag bug. Fixes #5008 ([8c693640](https://github.com/pixelfed/pixelfed/commit/8c693640))
-- Update PrivacySettings controller, refresh RelationshipService when unmute/unblocking ([b7322b68](https://github.com/pixelfed/pixelfed/commit/b7322b68))
-- Update ApiV1Controller, improve refresh relations logic when (un)muting or (un)blocking ([b8e96a5f](https://github.com/pixelfed/pixelfed/commit/b8e96a5f))
-- Update context menu, add mute/block/unfollow actions and update relationship store accordingly ([81d1e0fd](https://github.com/pixelfed/pixelfed/commit/81d1e0fd))
-- Update docker env, fix config_cache. Fixes #5033 ([858fcbf6](https://github.com/pixelfed/pixelfed/commit/858fcbf6))
-- Update UnfollowPipeline, fix follower count cache bug ([6bdf73de](https://github.com/pixelfed/pixelfed/commit/6bdf73de))
-- Update VideoPresenter component, add webkit-playsinline attribute to video element to prevent the full screen video player ([ad032916](https://github.com/pixelfed/pixelfed/commit/ad032916))
-- Update VideoPlayer component, add playsinline attribute to video element ([8af23607](https://github.com/pixelfed/pixelfed/commit/8af23607))
-- Update StatusController, refactor status embeds ([9a7acc12](https://github.com/pixelfed/pixelfed/commit/9a7acc12))
-- Update ProfileController, refactor profile embeds ([8b8b1ffc](https://github.com/pixelfed/pixelfed/commit/8b8b1ffc))
-- Update profile embed view, fix height bug ([65166570](https://github.com/pixelfed/pixelfed/commit/65166570))
--  ([](https://github.com/pixelfed/pixelfed/commit/))
-
-## [v0.11.13 (2024-03-05)](https://github.com/pixelfed/pixelfed/compare/v0.11.12...v0.11.13)
-
-### Features
-
-- Account Migrations ([#4968](https://github.com/pixelfed/pixelfed/pull/4968)) ([4a6be6212](https://github.com/pixelfed/pixelfed/pull/4968/commits/4a6be6212))
-- Curated Onboarding ([#4946](https://github.com/pixelfed/pixelfed/pull/4946)) ([8dac2caf](https://github.com/pixelfed/pixelfed/commit/8dac2caf))
-- Add Curated Onboarding Templates ([071163b4](https://github.com/pixelfed/pixelfed/commit/071163b4))
-- Add Remote Reports to Admin Dashboard Reports page ([ef0ff78e](https://github.com/pixelfed/pixelfed/commit/ef0ff78e))
-- Improved Docker Support ([#4844](https://github.com/pixelfed/pixelfed/pull/4844)) ([d92cf7f](https://github.com/pixelfed/pixelfed/commit/d92cf7f))
-
-### Updates
-
-- Update Inbox, cast live filters to lowercase ([d835e0ad](https://github.com/pixelfed/pixelfed/commit/d835e0ad))
-- Update federation config, increase default timeline days falloff to 90 days from 2 days. Fixes #4905 ([011834f4](https://github.com/pixelfed/pixelfed/commit/011834f4))
-- Update cache config, use predis as default redis driver client ([ea6b1623](https://github.com/pixelfed/pixelfed/commit/ea6b1623))
-- Update .gitattributes to collapse diffs on generated files ([ThisIsMissEm](https://github.com/pixelfed/pixelfed/commit/9978b2b9))
-- Update api v1/v2 instance endpoints, bump mastoapi version from 2.7.2 to 3.5.3 ([545f7d5e](https://github.com/pixelfed/pixelfed/commit/545f7d5e))
-- Update ApiV1Controller, implement better limit logic to gracefully handle requests with limits that exceed the max ([1f74a95d](https://github.com/pixelfed/pixelfed/commit/1f74a95d))
-- Update AdminCuratedRegisterController, show oldest applications first ([c4dde641](https://github.com/pixelfed/pixelfed/commit/c4dde641))
-- Update Directory logic, add curated onboarding support ([59c70239](https://github.com/pixelfed/pixelfed/commit/59c70239))
-- Update Inbox and StatusObserver, fix silently rejected direct messages due to saveQuietly which failed to generate a snowflake id ([089ba3c4](https://github.com/pixelfed/pixelfed/commit/089ba3c4))
-- Update Curated Onboarding dashboard, improve application filtering and make it easier to distinguish response state ([2b5d7235](https://github.com/pixelfed/pixelfed/commit/2b5d7235))
-- Update AdminReports, add story reports and fix cs ([767522a8](https://github.com/pixelfed/pixelfed/commit/767522a8))
-- Update AdminReportController, add story report support ([a16309ac](https://github.com/pixelfed/pixelfed/commit/a16309ac))
-- Update kb, add email confirmation issues page ([2f48df8c](https://github.com/pixelfed/pixelfed/commit/2f48df8c))
-- Update AdminCuratedRegisterController, filter confirmation activities from activitylog ([ab9ecb6e](https://github.com/pixelfed/pixelfed/commit/ab9ecb6e))
-- Update Inbox, fix flag validation condition, allow profile reports ([402a4607](https://github.com/pixelfed/pixelfed/commit/402a4607))
-- Update AccountTransformer, fix follower/following count visibility bug ([542d1106](https://github.com/pixelfed/pixelfed/commit/542d1106))
-- Update ProfileMigration model, add target relation ([3f053997](https://github.com/pixelfed/pixelfed/commit/3f053997))
-- Update ApiV1Controller, update Notifications endpoint to filter notifications with missing activities ([a933615b](https://github.com/pixelfed/pixelfed/commit/a933615b))
-- Update ApiV1Controller, fix public timeline scope, properly support both local + remote parameters ([d6eac655](https://github.com/pixelfed/pixelfed/commit/d6eac655))
-- Update ApiV1Controller, handle public feed parameter bug to gracefully fallback to min_id=1 when max_id=0 ([e3826c58](https://github.com/pixelfed/pixelfed/commit/e3826c58))
-- Update ApiV1Controller, fix hashtag feed to include private posts from accounts you follow or your own, and your own unlisted posts ([3b5500b3](https://github.com/pixelfed/pixelfed/commit/3b5500b3))
-- Update checkpoint view, improve input autocomplete. Fixes ([#4959](https://github.com/pixelfed/pixelfed/pull/4959)) ([d18824e7](https://github.com/pixelfed/pixelfed/commit/d18824e7))
-- Update navbar.vue, removes the 50px limit ([#4969](https://github.com/pixelfed/pixelfed/pull/4969)) ([7fd5599](https://github.com/pixelfed/pixelfed/commit/7fd5599))
-- Update ComposeModal.vue, add an informative UI error message when trying to create a mixed media album ([#4886](https://github.com/pixelfed/pixelfed/pull/4886)) ([fd4f41a](https://github.com/pixelfed/pixelfed/commit/fd4f41a))
-
-## [v0.11.12 (2024-02-16)](https://github.com/pixelfed/pixelfed/compare/v0.11.11...v0.11.12)
-
-### Features
-- Autospam Live Filters - block remote activities based on comma separated keywords ([40b45b2a](https://github.com/pixelfed/pixelfed/commit/40b45b2a))
-- Added Software Update banner to admin home feeds ([b0fb1988](https://github.com/pixelfed/pixelfed/commit/b0fb1988))
-
-### Updates
-
-- Update ApiV1Controller, fix network timeline ([0faf59e3](https://github.com/pixelfed/pixelfed/commit/0faf59e3))
-- Update public/network timelines, fix non-redis response and fix reblogs in home feed ([8b4ac5cc](https://github.com/pixelfed/pixelfed/commit/8b4ac5cc))
-- Update Federation, use proper Content-Type headers for following/follower collections ([fb0bb9a3](https://github.com/pixelfed/pixelfed/commit/fb0bb9a3))
-- Update ActivityPubFetchService, enforce stricter Content-Type validation ([1232cfc8](https://github.com/pixelfed/pixelfed/commit/1232cfc8))
-- Update status view, fix unlisted/private scope bug ([0f3ca194](https://github.com/pixelfed/pixelfed/commit/0f3ca194))
-
-## [v0.11.11 (2024-02-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.10...v0.11.11)
-
-### Fixes
-- Fix api endpoints ([fd7f5dbb](https://github.com/pixelfed/pixelfed/commit/fd7f5dbb))
-
-## [v0.11.10 (2024-02-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.9...v0.11.10)
-
-### Added
-- Resilient Media Storage ([#4665](https://github.com/pixelfed/pixelfed/pull/4665)) ([fb1deb6](https://github.com/pixelfed/pixelfed/commit/fb1deb6))
-- Video WebP2P ([#4713](https://github.com/pixelfed/pixelfed/pull/4713)) ([0405ef12](https://github.com/pixelfed/pixelfed/commit/0405ef12))
-- Added user:2fa command to easily disable 2FA for given account ([c6408fd7](https://github.com/pixelfed/pixelfed/commit/c6408fd7))
-- Added `avatar:storage-deep-clean` command to dispatch remote avatar storage cleanup jobs ([c37b7cde](https://github.com/pixelfed/pixelfed/commit/c37b7cde))
-- Added S3 command to rewrite media urls ([5b3a5610](https://github.com/pixelfed/pixelfed/commit/5b3a5610))
-- Experimental home feed ([#4752](https://github.com/pixelfed/pixelfed/pull/4752)) ([c39b9afb](https://github.com/pixelfed/pixelfed/commit/c39b9afb))
-- Added `app:hashtag-cached-count-update` command to update cached_count of hashtags and add to scheduler to run every 25 minutes past the hour ([1e31fee6](https://github.com/pixelfed/pixelfed/commit/1e31fee6))
-- Added `app:hashtag-related-generate` command to generate related hashtags ([176b4ed7](https://github.com/pixelfed/pixelfed/commit/176b4ed7))
-- Added Mutual Followers API endpoint ([33dbbe46](https://github.com/pixelfed/pixelfed/commit/33dbbe46))
-- Added User Domain Blocks ([#4834](https://github.com/pixelfed/pixelfed/pull/4834)) ([fa0380ac](https://github.com/pixelfed/pixelfed/commit/fa0380ac))
-- Added Parental Controls ([#4862](https://github.com/pixelfed/pixelfed/pull/4862)) ([c91f1c59](https://github.com/pixelfed/pixelfed/commit/c91f1c59))
-- Added Forgot Email Feature ([67c650b1](https://github.com/pixelfed/pixelfed/commit/67c650b1))
-- Added S3 IG Import Media Storage support ([#4891](https://github.com/pixelfed/pixelfed/pull/4891)) ([081360b9](https://github.com/pixelfed/pixelfed/commit/081360b9))
-
-### Federation
-- Update Privacy Settings, add support for Mastodon `indexable` search flag ([fc24630e](https://github.com/pixelfed/pixelfed/commit/fc24630e))
-- Update AP Helpers, consume actor `indexable` attribute ([fbdcdd9d](https://github.com/pixelfed/pixelfed/commit/fbdcdd9d))
-
-### Updates
-- Update FollowerService, add forget method to RelationshipService call to reduce load when mass purging ([347e4f59](https://github.com/pixelfed/pixelfed/commit/347e4f59))
-- Update FollowServiceWarmCache, improve handling larger following/follower lists ([61a6d904](https://github.com/pixelfed/pixelfed/commit/61a6d904))
-- Update StoryApiV1Controller, add viewers route to view story viewers ([941736ce](https://github.com/pixelfed/pixelfed/commit/941736ce))
-- Update NotificationService, improve cache warming query ([2496386d](https://github.com/pixelfed/pixelfed/commit/2496386d))
-- Update StatusService, hydrate accounts on request instead of caching them along with status objects ([223661ec](https://github.com/pixelfed/pixelfed/commit/223661ec))
-- Update profile embed, fix resize ([dc23c21d](https://github.com/pixelfed/pixelfed/commit/dc23c21d))
-- Update Status model, improve thumb logic ([d969a973](https://github.com/pixelfed/pixelfed/commit/d969a973))
-- Update Status model, allow unlisted thumbnails ([1f0a45b7](https://github.com/pixelfed/pixelfed/commit/1f0a45b7))
-- Update StatusTagsPipeline, fix object tags and slug normalization ([d295e605](https://github.com/pixelfed/pixelfed/commit/d295e605))
-- Update Note and CreateNote transformers, include attachment blurhash, width and height ([ce1afe27](https://github.com/pixelfed/pixelfed/commit/ce1afe27))
-- Update ap helpers, store media attachment width and height if present ([8c969191](https://github.com/pixelfed/pixelfed/commit/8c969191))
-- Update Sign-in with Mastodon, allow usage when registrations are closed ([895dc4fa](https://github.com/pixelfed/pixelfed/commit/895dc4fa))
-- Update profile embeds, filter sensitive posts ([ede5ec3b](https://github.com/pixelfed/pixelfed/commit/ede5ec3b))
-- Update ApiV1Controller, hydrate reblog interactions. Fixes ([#4686](https://github.com/pixelfed/pixelfed/issues/4686)) ([135798eb](https://github.com/pixelfed/pixelfed/commit/135798eb))
-- Update AdminReportController, add `profile_id` to group by. Fixes ([#4685](https://github.com/pixelfed/pixelfed/issues/4685)) ([e4d3b196](https://github.com/pixelfed/pixelfed/commit/e4d3b196))
-- Update user:admin command, improve logic. Fixes ([#2465](https://github.com/pixelfed/pixelfed/issues/2465)) ([01bac511](https://github.com/pixelfed/pixelfed/commit/01bac511))
-- Update AP helpers, adjust RemoteAvatarFetch ttl from 24h to 3 months ([36b23fe3](https://github.com/pixelfed/pixelfed/commit/36b23fe3))
-- Update AvatarPipeline, improve refresh logic and garbage collection to purge old avatars ([82798b5e](https://github.com/pixelfed/pixelfed/commit/82798b5e))
-- Update CreateAvatar job, add processing constraints and set `is_remote` attribute ([319ced40](https://github.com/pixelfed/pixelfed/commit/319ced40))
-- Update RemoteStatusDelete and DecrementPostCount pipelines ([edbcf3ed](https://github.com/pixelfed/pixelfed/commit/edbcf3ed))
-- Update lexer regex, fix mention regex and add more tests ([778e83d3](https://github.com/pixelfed/pixelfed/commit/778e83d3))
-- Update StatusTransformer, generate autolink on request ([dfe2379b](https://github.com/pixelfed/pixelfed/commit/dfe2379b))
-- Update ComposeModal component, fix multi filter bug and allow media re-ordering before upload/posting ([56e315f6](https://github.com/pixelfed/pixelfed/commit/56e315f6))
-- Update ApiV1Dot1Controller, allow iar rate limits to be configurable ([28a80803](https://github.com/pixelfed/pixelfed/commit/28a80803))
-- Update ApiV1Dot1Controller, add domain to iar redirect ([1f82d47c](https://github.com/pixelfed/pixelfed/commit/1f82d47c))
-- Update ApiV1Dot1Controller, add configurable app confirm rate limit ttl ([4c6a0719](https://github.com/pixelfed/pixelfed/commit/4c6a0719))
-- Update LikePipeline, dispatch to feed queue. Fixes ([#4723](https://github.com/pixelfed/pixelfed/issues/4723)) ([da510089](https://github.com/pixelfed/pixelfed/commit/da510089))
-- Update AccountImport ([5a2d7e3e](https://github.com/pixelfed/pixelfed/commit/5a2d7e3e))
-- Update ImportPostController, fix IG bug with missing spaces between hashtags ([9c24157a](https://github.com/pixelfed/pixelfed/commit/9c24157a))
-- Update ApiV1Controller, fix mutes in home feed ([ddc21714](https://github.com/pixelfed/pixelfed/commit/ddc21714))
-- Update AP helpers, improve preferredUsername validation ([21218c79](https://github.com/pixelfed/pixelfed/commit/21218c79))
-- Update delete pipelines, properly invoke StatusHashtag delete events ([ce54d29c](https://github.com/pixelfed/pixelfed/commit/ce54d29c))
-- Update mail config ([0e431271](https://github.com/pixelfed/pixelfed/commit/0e431271))
-- Update hashtag following ([015b1b80](https://github.com/pixelfed/pixelfed/commit/015b1b80))
-- Update IncrementPostCount job, prevent overlap ([b2c9cc23](https://github.com/pixelfed/pixelfed/commit/b2c9cc23))
-- Update HashtagFollowService, fix cache invalidation bug ([84f4e885](https://github.com/pixelfed/pixelfed/commit/84f4e885))
-- Update Experimental Home Feed, fix remote posts, shares and reblogs ([c6a6b3ae](https://github.com/pixelfed/pixelfed/commit/c6a6b3ae))
-- Update HashtagService, improve count perf ([3327a008](https://github.com/pixelfed/pixelfed/commit/3327a008))
-- Update StatusHashtagService, remove problematic cache layer ([e5401f85](https://github.com/pixelfed/pixelfed/commit/e5401f85))
-- Update HomeFeedPipeline, fix tag filtering ([f105f4e8](https://github.com/pixelfed/pixelfed/commit/f105f4e8))
-- Update HashtagService, reduce cached_count cache ttl ([15f29f7d](https://github.com/pixelfed/pixelfed/commit/15f29f7d))
-- Update ApiV1Controller, fix include_reblogs param on timelines/home endpoint, and improve limit pagination logic ([287f903b](https://github.com/pixelfed/pixelfed/commit/287f903b))
-- Update StoryApiV1Controller, add self-carousel endpoint. Fixes ([#4352](https://github.com/pixelfed/pixelfed/issues/4352)) ([bcb88d5b](https://github.com/pixelfed/pixelfed/commit/bcb88d5b))
-- Update FollowServiceWarmCache, use more efficient query ([fe9b4c5a](https://github.com/pixelfed/pixelfed/commit/fe9b4c5a))
-- Update HomeFeedPipeline, observe mutes/blocks during fanout ([8548294c](https://github.com/pixelfed/pixelfed/commit/8548294c))
-- Update FederationController, add proper following/follower counts ([3204fb96](https://github.com/pixelfed/pixelfed/commit/3204fb96))
-- Update FederationController, add proper statuses counts ([3204fb96](https://github.com/pixelfed/pixelfed/commit/3204fb96))
-- Update Inbox handler, fix missing object_url and uri fields for direct statuses ([a0157fce](https://github.com/pixelfed/pixelfed/commit/a0157fce))
-- Update DirectMessageController, deliver direct delete activities to user inbox instead of sharedInbox ([d848792a](https://github.com/pixelfed/pixelfed/commit/d848792a))
-- Update DirectMessageController, dispatch deliver and delete actions to the job queue ([7f462a80](https://github.com/pixelfed/pixelfed/commit/7f462a80))
-- Update Inbox, improve story attribute collection ([06bee36c](https://github.com/pixelfed/pixelfed/commit/06bee36c))
-- Update DirectMessageController, dispatch local deletes to pipeline ([98186564](https://github.com/pixelfed/pixelfed/commit/98186564))
-- Update StatusPipeline, fix Direct and Story notification deletion ([4c95306f](https://github.com/pixelfed/pixelfed/commit/4c95306f))
-- Update Notifications.vue, fix deprecated DM action links for story activities ([4c3823b0](https://github.com/pixelfed/pixelfed/commit/4c3823b0))
-- Update ComposeModal, fix missing alttext post state ([0a068119](https://github.com/pixelfed/pixelfed/commit/0a068119))
-- Update PhotoAlbumPresenter.vue, fix fullscreen mode ([822e9888](https://github.com/pixelfed/pixelfed/commit/822e9888))
-- Update Timeline.vue, improve CHT pagination ([9c43e7e2](https://github.com/pixelfed/pixelfed/commit/9c43e7e2))
-- Update HomeFeedPipeline, fix StatusService validation ([041c0135](https://github.com/pixelfed/pixelfed/commit/041c0135))
-- Update Inbox, improve tombstone query efficiency ([759a4393](https://github.com/pixelfed/pixelfed/commit/759a4393))
-- Update AccountService, add setLastActive method ([ebbd98e7](https://github.com/pixelfed/pixelfed/commit/ebbd98e7))
-- Update ApiV1Controller, set last_active_at ([b6419545](https://github.com/pixelfed/pixelfed/commit/b6419545))
-- Update AdminShadowFilter, fix deleted profile bug ([a492a95a](https://github.com/pixelfed/pixelfed/commit/a492a95a))
-- Update FollowerService, add $silent param to remove method to more efficently purge relationships ([1664a5bc](https://github.com/pixelfed/pixelfed/commit/1664a5bc))
-- Update AP ProfileTransformer, add published attribute ([adfaa2b1](https://github.com/pixelfed/pixelfed/commit/adfaa2b1))
-- Update meta tags, improve descriptions and seo/og tags ([fd44c80c](https://github.com/pixelfed/pixelfed/commit/fd44c80c))
-- Update login view, add email prefill logic ([d76f0168](https://github.com/pixelfed/pixelfed/commit/d76f0168))
-- Update LoginController, fix captcha validation error message ([0325e171](https://github.com/pixelfed/pixelfed/commit/0325e171))
-- Update ApiV1Controller, properly cast boolean sensitive parameter. Fixes #4888 ([0aff126a](https://github.com/pixelfed/pixelfed/commit/0aff126a))
-- Update AccountImport.vue, fix new IG export format ([59aa6a4b](https://github.com/pixelfed/pixelfed/commit/59aa6a4b))
-- Update TransformImports command, fix import service condition ([32c59f04](https://github.com/pixelfed/pixelfed/commit/32c59f04))
-- Update AP helpers, more efficently update post count ([7caed381](https://github.com/pixelfed/pixelfed/commit/7caed381))
-- Update AP helpers, refactor post count decrement logic ([b81ae577](https://github.com/pixelfed/pixelfed/commit/b81ae577))
-- Update AP helpers, fix sensitive bug ([00ed330c](https://github.com/pixelfed/pixelfed/commit/00ed330c))
-- Update NotificationEpochUpdatePipeline, use more efficient query ([4d401389](https://github.com/pixelfed/pixelfed/commit/4d401389))
-- Update notification pipelines, fix non-local saving ([fa97a1f3](https://github.com/pixelfed/pixelfed/commit/fa97a1f3))
-- Update NodeinfoService, disable redirects ([240e6bbe](https://github.com/pixelfed/pixelfed/commit/240e6bbe))
-- Update Instance model, add entity casts ([289cad47](https://github.com/pixelfed/pixelfed/commit/289cad47))
-- Update FetchNodeinfoPipeline, use more efficient dispatch ([ac01f51a](https://github.com/pixelfed/pixelfed/commit/ac01f51a))
-- Update horizon.php config ([1e3acade](https://github.com/pixelfed/pixelfed/commit/1e3acade))
-- Update PublicApiController, consume InstanceService blocked domains for account and statuses endpoints ([01b33fb3](https://github.com/pixelfed/pixelfed/commit/01b33fb3))
-- Update ApiV1Controller, enforce blocked instance domain logic ([5b284cac](https://github.com/pixelfed/pixelfed/commit/5b284cac))
-- Update ApiV2Controller, add vapid key to instance object. Thanks thisismissem! ([4d02d6f1](https://github.com/pixelfed/pixelfed/commit/4d02d6f1))
-
-## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9)
+## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.8...dev)
 
 ### Added
 - Import from Instagram ([#4466](https://github.com/pixelfed/pixelfed/pull/4466)) ([cf3078c5](https://github.com/pixelfed/pixelfed/commit/cf3078c5))
 - Sign-in with Mastodon ([#4545](https://github.com/pixelfed/pixelfed/pull/4545)) ([45b9404e](https://github.com/pixelfed/pixelfed/commit/45b9404e))
-- Health check endpoint at /api/service/health-check ([ff58f970](https://github.com/pixelfed/pixelfed/commit/ff58f970))
-- Reblogs in home feed ([#4563](https://github.com/pixelfed/pixelfed/pull/4563)) ([b86d47bf](https://github.com/pixelfed/pixelfed/commit/b86d47bf))
-- Account Migrations ([#4578](https://github.com/pixelfed/pixelfed/pull/4578)) ([a9220e4e](https://github.com/pixelfed/pixelfed/commit/a9220e4e))
 
 ### Updates
 - Update Notifications.vue component, fix filtering logic to prevent endless spinner ([3df9b53f](https://github.com/pixelfed/pixelfed/commit/3df9b53f))
@@ -274,20 +39,7 @@
 - Update MediaStorageService, improve head header handling ([3590adbd](https://github.com/pixelfed/pixelfed/commit/3590adbd))
 - Update admin user view, improve previews ([ff2c16fe](https://github.com/pixelfed/pixelfed/commit/ff2c16fe))
 - Update FanoutDeletePipeline, fix AP object ([0d802c31](https://github.com/pixelfed/pixelfed/commit/0d802c31))
-- Update Remote Auth feature, fix custom domain bug and enforce banned domains ([acabf603](https://github.com/pixelfed/pixelfed/commit/acabf603))
-- Update StatusService, reduce cache ttl from 7 days to 6 hours ([59b64378](https://github.com/pixelfed/pixelfed/commit/59b64378))
-- Update ProfileController, allow albums in atom feed. Closes #4561. Fixes #4526 ([1c105a6c](https://github.com/pixelfed/pixelfed/commit/1c105a6c))
-- Update admin users view, fix website value. Closes #4557 ([c469d475](https://github.com/pixelfed/pixelfed/commit/c469d475))
-- Update StatusStatelessTransformer, allow unlisted reblogs ([1c13b518](https://github.com/pixelfed/pixelfed/commit/1c13b518))
-- Update ApiV1Controller, hydrate reblog state in home timeline ([13bdaa2e](https://github.com/pixelfed/pixelfed/commit/13bdaa2e))
-- Update Timeline component, improve reblog support ([29de91e5](https://github.com/pixelfed/pixelfed/commit/29de91e5))
-- Update timeline settings, add photo reblogs only option ([e2705b9a](https://github.com/pixelfed/pixelfed/commit/e2705b9a))
-- Update PostContent, add text cw warning ([911504fa](https://github.com/pixelfed/pixelfed/commit/911504fa))
-- Update ActivityPubFetchService, add validateUrl parameter to bypass url validation to fetch content from blocked instances ([3d1b6516](https://github.com/pixelfed/pixelfed/commit/3d1b6516))
-- Update RemoteStatusDelete pipeline ([71e92261](https://github.com/pixelfed/pixelfed/commit/71e92261))
-- Update RemoteStatusDelete pipeline ([fab8f25e](https://github.com/pixelfed/pixelfed/commit/fab8f25e))
-- Update RemoteStatusPipeline, fix reply check ([618b6727](https://github.com/pixelfed/pixelfed/commit/618b6727))
-- Update ApiV1Controller, add bookmarked to timeline entities ([ca746717](https://github.com/pixelfed/pixelfed/commit/ca746717))
+-  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.8 (2023-05-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.7...v0.11.8)
 

CODEOWNERS

@@ -1,18 +0,0 @@
-# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-*           @dansup
-
-# Docker related files
-.editorconfig               @jippi @dansup
-.env                        @jippi @dansup
-.env.*                      @jippi @dansup
-.hadolint.yaml              @jippi @dansup
-.shellcheckrc               @jippi @dansup
-/.github/                   @jippi @dansup
-/docker/                    @jippi @dansup
-/tests/                     @jippi @dansup
-docker-compose.migrate.yml  @jippi @dansup
-docker-compose.yml          @jippi @dansup
-goss.yaml                   @jippi @dansup

Dockerfile

@@ -1,307 +0,0 @@
-# syntax=docker/dockerfile:1
-# See https://hub.docker.com/r/docker/dockerfile
-
-#######################################################
-# Configuration
-#######################################################
-
-# See: https://github.com/mlocati/docker-php-extension-installer
-ARG DOCKER_PHP_EXTENSION_INSTALLER_VERSION="2.1.80"
-
-# See: https://github.com/composer/composer
-ARG COMPOSER_VERSION="2.6"
-
-# See: https://nginx.org/
-ARG NGINX_VERSION="1.25.3"
-
-# See: https://github.com/ddollar/forego
-ARG FOREGO_VERSION="0.17.2"
-
-# See: https://github.com/hairyhenderson/gomplate
-ARG GOMPLATE_VERSION="v3.11.6"
-
-# See: https://github.com/jippi/dottie
-ARG DOTTIE_VERSION="v0.9.5"
-
-###
-# PHP base configuration
-###
-
-# See: https://hub.docker.com/_/php/tags
-ARG PHP_VERSION="8.1"
-
-# See: https://github.com/docker-library/docs/blob/master/php/README.md#image-variants
-ARG PHP_BASE_TYPE="apache"
-ARG PHP_DEBIAN_RELEASE="bullseye"
-
-ARG RUNTIME_UID=33 # often called 'www-data'
-ARG RUNTIME_GID=33 # often called 'www-data'
-
-# APT extra packages
-ARG APT_PACKAGES_EXTRA=
-
-# Extensions installed via [pecl install]
-# ! NOTE: imagick is installed from [master] branch on GitHub due to 8.3 bug on ARM that haven't
-# ! been released yet (after +10 months)!
-# ! See: https://github.com/Imagick/imagick/pull/641
-ARG PHP_PECL_EXTENSIONS="redis https://codeload.github.com/Imagick/imagick/tar.gz/28f27044e435a2b203e32675e942eb8de620ee58"
-ARG PHP_PECL_EXTENSIONS_EXTRA=
-
-# Extensions installed via [docker-php-ext-install]
-ARG PHP_EXTENSIONS="intl bcmath zip pcntl exif curl gd"
-ARG PHP_EXTENSIONS_EXTRA=""
-ARG PHP_EXTENSIONS_DATABASE="pdo_pgsql pdo_mysql pdo_sqlite"
-
-# GPG key for nginx apt repository
-ARG NGINX_GPGKEY="573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62"
-
-# GPP key path for nginx apt repository
-ARG NGINX_GPGKEY_PATH="/usr/share/keyrings/nginx-archive-keyring.gpg"
-
-#######################################################
-# Docker "copy from" images
-#######################################################
-
-# Composer docker image from Docker Hub
-#
-# NOTE: Docker will *not* pull this image unless it's referenced (via build target)
-FROM composer:${COMPOSER_VERSION} AS composer-image
-
-# php-extension-installer image from Docker Hub
-#
-# NOTE: Docker will *not* pull this image unless it's referenced (via build target)
-FROM mlocati/php-extension-installer:${DOCKER_PHP_EXTENSION_INSTALLER_VERSION} AS php-extension-installer
-
-# nginx webserver from Docker Hub.
-# Used to copy some docker-entrypoint files for [nginx-runtime]
-#
-# NOTE: Docker will *not* pull this image unless it's referenced (via build target)
-FROM nginx:${NGINX_VERSION} AS nginx-image
-
-# Forego is a Procfile "runner" that makes it trival to run multiple
-# processes under a simple init / PID 1 process.
-#
-# NOTE: Docker will *not* pull this image unless it's referenced (via build target)
-#
-# See: https://github.com/nginx-proxy/forego
-FROM nginxproxy/forego:${FOREGO_VERSION}-debian AS forego-image
-
-# Dottie makes working with .env files easier and safer
-#
-# NOTE: Docker will *not* pull this image unless it's referenced (via build target)
-#
-# See: https://github.com/jippi/dottie
-FROM ghcr.io/jippi/dottie:${DOTTIE_VERSION} AS dottie-image
-
-# gomplate-image grabs the gomplate binary from GitHub releases
-#
-# It's in its own layer so it can be fetched in parallel with other build steps
-FROM php:${PHP_VERSION}-${PHP_BASE_TYPE}-${PHP_DEBIAN_RELEASE} AS gomplate-image
-
-ARG TARGETARCH
-ARG TARGETOS
-ARG GOMPLATE_VERSION
-
-RUN set -ex \
-    && curl \
-        --silent \
-        --show-error \
-        --location \
-        --output /usr/local/bin/gomplate \
-        https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_${TARGETOS}-${TARGETARCH} \
-    && chmod +x /usr/local/bin/gomplate \
-    && /usr/local/bin/gomplate --version
-
-#######################################################
-# Base image
-#######################################################
-
-FROM php:${PHP_VERSION}-${PHP_BASE_TYPE}-${PHP_DEBIAN_RELEASE} AS base
-
-ARG BUILDKIT_SBOM_SCAN_STAGE="true"
-
-ARG APT_PACKAGES_EXTRA
-ARG PHP_DEBIAN_RELEASE
-ARG PHP_VERSION
-ARG RUNTIME_GID
-ARG RUNTIME_UID
-ARG TARGETPLATFORM
-
-ENV DEBIAN_FRONTEND="noninteractive"
-
-# Ensure we run all scripts through 'bash' rather than 'sh'
-SHELL ["/bin/bash", "-c"]
-
-RUN set -ex \
-    && mkdir -pv /var/www/ \
-    && chown -R ${RUNTIME_UID}:${RUNTIME_GID} /var/www
-
-WORKDIR /var/www/
-
-ENV APT_PACKAGES_EXTRA=${APT_PACKAGES_EXTRA}
-
-# Install and configure base layer
-COPY docker/shared/root/docker/install/base.sh /docker/install/base.sh
-
-RUN --mount=type=cache,id=pixelfed-apt-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/lib/apt \
-    --mount=type=cache,id=pixelfed-apt-cache-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/cache/apt \
-    /docker/install/base.sh
-
-#######################################################
-# PHP: extensions
-#######################################################
-
-FROM base AS php-extensions
-
-ARG PHP_DEBIAN_RELEASE
-ARG PHP_EXTENSIONS
-ARG PHP_EXTENSIONS_DATABASE
-ARG PHP_EXTENSIONS_EXTRA
-ARG PHP_PECL_EXTENSIONS
-ARG PHP_PECL_EXTENSIONS_EXTRA
-ARG PHP_VERSION
-ARG TARGETPLATFORM
-
-COPY --from=php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
-
-COPY docker/shared/root/docker/install/php-extensions.sh /docker/install/php-extensions.sh
-
-RUN --mount=type=cache,id=pixelfed-pear-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/tmp/pear  \
-    --mount=type=cache,id=pixelfed-apt-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/lib/apt \
-    --mount=type=cache,id=pixelfed-apt-cache-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/cache/apt \
-    PHP_EXTENSIONS=${PHP_EXTENSIONS} \
-    PHP_EXTENSIONS_DATABASE=${PHP_EXTENSIONS_DATABASE} \
-    PHP_EXTENSIONS_EXTRA=${PHP_EXTENSIONS_EXTRA} \
-    PHP_PECL_EXTENSIONS=${PHP_PECL_EXTENSIONS} \
-    PHP_PECL_EXTENSIONS_EXTRA=${PHP_PECL_EXTENSIONS_EXTRA} \
-    /docker/install/php-extensions.sh
-
-#######################################################
-# PHP: composer and source code
-#######################################################
-
-FROM php-extensions AS composer-and-src
-
-ARG PHP_VERSION
-ARG PHP_DEBIAN_RELEASE
-ARG RUNTIME_UID
-ARG RUNTIME_GID
-ARG TARGETPLATFORM
-
-# Make sure composer cache is targeting our cache mount later
-ENV COMPOSER_CACHE_DIR="/cache/composer"
-
-# Don't enforce any memory limits for composer
-ENV COMPOSER_MEMORY_LIMIT=-1
-
-# Disable interactvitity from composer
-ENV COMPOSER_NO_INTERACTION=1
-
-# Copy composer from https://hub.docker.com/_/composer
-COPY --link --from=composer-image /usr/bin/composer /usr/bin/composer
-
-#! Changing user to runtime user
-USER ${RUNTIME_UID}:${RUNTIME_GID}
-
-# Install composer dependencies
-# NOTE: we skip the autoloader generation here since we don't have all files avaliable (yet)
-RUN --mount=type=cache,id=pixelfed-composer-${PHP_VERSION},sharing=locked,target=/cache/composer \
-    --mount=type=bind,source=composer.json,target=/var/www/composer.json \
-    --mount=type=bind,source=composer.lock,target=/var/www/composer.lock \
-    set -ex \
-    && composer install --prefer-dist --no-autoloader --ignore-platform-reqs
-
-# Copy all other files over
-COPY --chown=${RUNTIME_UID}:${RUNTIME_GID} . /var/www/
-
-#######################################################
-# Runtime: base
-#######################################################
-
-FROM php-extensions AS shared-runtime
-
-ARG RUNTIME_GID
-ARG RUNTIME_UID
-
-ENV RUNTIME_UID=${RUNTIME_UID}
-ENV RUNTIME_GID=${RUNTIME_GID}
-
-COPY --link --from=forego-image /usr/local/bin/forego /usr/local/bin/forego
-COPY --link --from=dottie-image /dottie /usr/local/bin/dottie
-COPY --link --from=gomplate-image /usr/local/bin/gomplate /usr/local/bin/gomplate
-COPY --link --from=composer-image /usr/bin/composer /usr/bin/composer
-COPY --link --from=composer-and-src --chown=${RUNTIME_UID}:${RUNTIME_GID} /var/www /var/www
-
-#! Changing user to runtime user
-USER ${RUNTIME_UID}:${RUNTIME_GID}
-
-# Generate optimized autoloader now that we have all files around
-RUN set -ex \
-    && ENABLE_CONFIG_CACHE=false composer dump-autoload --optimize
-
-USER root
-
-# for detail why storage is copied this way, pls refer to https://github.com/pixelfed/pixelfed/pull/2137#discussion_r434468862
-RUN set -ex \
-    && cp --recursive --link --preserve=all storage storage.skel \
-    && rm -rf html && ln -s public html
-
-COPY docker/shared/root /
-
-ENTRYPOINT ["/docker/entrypoint.sh"]
-
-#######################################################
-# Runtime: apache
-#######################################################
-
-FROM shared-runtime AS apache-runtime
-
-COPY docker/apache/root /
-
-RUN set -ex \
-    && a2enmod rewrite remoteip proxy proxy_http \
-    && a2enconf remoteip
-
-CMD ["apache2-foreground"]
-
-#######################################################
-# Runtime: fpm
-#######################################################
-
-FROM shared-runtime AS fpm-runtime
-
-COPY docker/fpm/root /
-
-CMD ["php-fpm"]
-
-#######################################################
-# Runtime: nginx
-#######################################################
-
-FROM shared-runtime AS nginx-runtime
-
-ARG NGINX_GPGKEY
-ARG NGINX_GPGKEY_PATH
-ARG NGINX_VERSION
-ARG PHP_DEBIAN_RELEASE
-ARG PHP_VERSION
-ARG TARGETPLATFORM
-
-# Install nginx dependencies
-RUN --mount=type=cache,id=pixelfed-apt-lists-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/lib/apt/lists \
-    --mount=type=cache,id=pixelfed-apt-cache-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/cache/apt \
-    set -ex \
-    && gpg1 --keyserver "hkp://keyserver.ubuntu.com:80" --keyserver-options timeout=10 --recv-keys "${NGINX_GPGKEY}" \
-    && gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" \
-    && echo "deb [signed-by=${NGINX_GPGKEY_PATH}] https://nginx.org/packages/mainline/debian/ ${PHP_DEBIAN_RELEASE} nginx" >> /etc/apt/sources.list.d/nginx.list \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}*
-
-# copy docker entrypoints from the *real* nginx image directly
-COPY --link --from=nginx-image /docker-entrypoint.d /docker/entrypoint.d/
-COPY docker/nginx/root /
-COPY docker/nginx/Procfile .
-
-STOPSIGNAL SIGQUIT
-
-CMD ["forego", "start", "-r"]

app/Auth/BearerTokenResponse.php

@@ -18,7 +18,8 @@ class BearerTokenResponse extends \League\OAuth2\Server\ResponseTypes\BearerToke
     protected function getExtraParams(AccessTokenEntityInterface $accessToken)
     {
         return [
-            'created_at' => time(),
+        	'created_at' => time(),
+        	'scope' => 'read write follow push'
         ];
     }
 }

app/Console/Commands/AccountPostCountStatUpdate.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Services\AccountService;
-use App\Services\Account\AccountStatService;
-use App\Status;
-use App\Profile;
-
-class AccountPostCountStatUpdate extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:account-post-count-stat-update';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Update post counts from recent activities';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $ids = AccountStatService::getAllPostCountIncr();
-        if(!$ids || !count($ids)) {
-            return;
-        }
-        foreach($ids as $id) {
-            $acct = AccountService::get($id, true);
-            if(!$acct) {
-                AccountStatService::removeFromPostCount($id);
-                continue;
-            }
-            $statusCount = Status::whereProfileId($id)->count();
-            if($statusCount != $acct['statuses_count']) {
-                $profile = Profile::find($id);
-                if(!$profile) {
-                    AccountStatService::removeFromPostCount($id);
-                    continue;
-                }
-                $profile->status_count = $statusCount;
-                $profile->save();
-                AccountService::del($id);
-            }
-            AccountStatService::removeFromPostCount($id);
-        }
-        return;
-    }
-}

app/Console/Commands/AddUserDomainBlock.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\User;
-use App\Models\DefaultDomainBlock;
-use App\Models\UserDomainBlock;
-use function Laravel\Prompts\text;
-use function Laravel\Prompts\confirm;
-use function Laravel\Prompts\progress;
-
-class AddUserDomainBlock extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:add-user-domain-block';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Apply a domain block to all users';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $domain = text('Enter domain you want to block');
-        $domain = strtolower($domain);
-        $domain = $this->validateDomain($domain);
-        if(!$domain || empty($domain)) {
-            $this->error('Invalid domain');
-            return;
-        }
-        $this->processBlocks($domain);
-        return;
-    }
-
-    protected function validateDomain($domain)
-    {
-        if(!strpos($domain, '.')) {
-            return;
-        }
-
-        if(str_starts_with($domain, 'https://')) {
-            $domain = str_replace('https://', '', $domain);
-        }
-
-        if(str_starts_with($domain, 'http://')) {
-            $domain = str_replace('http://', '', $domain);
-        }
-
-        $domain = strtolower(parse_url('https://' . $domain, PHP_URL_HOST));
-
-        $valid = filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME|FILTER_NULL_ON_FAILURE);
-        if(!$valid) {
-            return;
-        }
-
-        if($domain === config('pixelfed.domain.app')) {
-            $this->error('Invalid domain');
-            return;
-        }
-
-        $confirmed = confirm('Are you sure you want to block ' . $domain . '?');
-        if(!$confirmed) {
-            return;
-        }
-
-        return $domain;
-    }
-
-    protected function processBlocks($domain)
-    {
-        DefaultDomainBlock::updateOrCreate([
-            'domain' => $domain
-        ]);
-        progress(
-            label: 'Updating user domain blocks...',
-            steps: User::lazyById(500),
-            callback: fn ($user) => $this->performTask($user, $domain),
-        );
-    }
-
-    protected function performTask($user, $domain)
-    {
-        if(!$user->profile_id || $user->delete_after) {
-            return;
-        }
-
-        if($user->status != null && $user->status != 'disabled') {
-            return;
-        }
-
-        UserDomainBlock::updateOrCreate([
-            'profile_id' => $user->profile_id,
-            'domain' => $domain
-        ]);
-    }
-}

app/Console/Commands/AvatarStorage.php

@@ -82,7 +82,7 @@ class AvatarStorage extends Command
 
         $this->line(' ');
 
-        if((bool) config_cache('pixelfed.cloud_storage')) {
+        if(config_cache('pixelfed.cloud_storage')) {
             $this->info('✅ - Cloud storage configured');
             $this->line(' ');
         }
@@ -92,7 +92,7 @@ class AvatarStorage extends Command
             $this->line(' ');
         }
 
-        if((bool) config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud')) {
+        if(config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud')) {
             $disk = Storage::disk(config_cache('filesystems.cloud'));
             $exists = $disk->exists('cache/avatars/default.jpg');
             $state = $exists ? '✅' : '❌';
@@ -100,7 +100,7 @@ class AvatarStorage extends Command
             $this->info($msg);
         }
 
-        $options = (bool) config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud') ?
+        $options = config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud') ?
             [
                 'Cancel',
                 'Upload default avatar to cloud',
@@ -164,7 +164,7 @@ class AvatarStorage extends Command
 
     protected function uploadAvatarsToCloud()
     {
-        if(!(bool) config_cache('pixelfed.cloud_storage') || !config('instance.avatar.local_to_cloud')) {
+        if(!config_cache('pixelfed.cloud_storage') || !config('instance.avatar.local_to_cloud')) {
             $this->error('Enable cloud storage and avatar cloud storage to perform this action');
             return;
         }
@@ -213,7 +213,7 @@ class AvatarStorage extends Command
             return;
         }
 
-        if((bool) config_cache('pixelfed.cloud_storage') == false && config_cache('federation.avatars.store_local') == false) {
+        if(config_cache('pixelfed.cloud_storage') == false && config_cache('federation.avatars.store_local') == false) {
             $this->error('You have cloud storage disabled and local avatar storage disabled, we cannot refetch avatars.');
             return;
         }

app/Console/Commands/AvatarStorageDeepClean.php

@@ -1,115 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use Cache;
-use Storage;
-use App\Avatar;
-use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
-
-class AvatarStorageDeepClean extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'avatar:storage-deep-clean';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Cleanup avatar storage';
-
-    protected $shouldKeepRunning = true;
-    protected $counter = 0;
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): void
-    {
-        $this->info('       ____  _           ______         __  ');
-        $this->info('      / __ \(_)  _____  / / __/__  ____/ /  ');
-        $this->info('     / /_/ / / |/_/ _ \/ / /_/ _ \/ __  /   ');
-        $this->info('    / ____/ />  </  __/ / __/  __/ /_/ /    ');
-        $this->info('   /_/   /_/_/|_|\___/_/_/  \___/\__,_/     ');
-        $this->info(' ');
-        $this->info('    Pixelfed Avatar Deep Cleaner');
-        $this->line(' ');
-        $this->info('    Purge/delete old and outdated avatars from remote accounts');
-        $this->line(' ');
-
-        $storage = [
-            'cloud' => (bool) config_cache('pixelfed.cloud_storage'),
-            'local' => boolval(config_cache('federation.avatars.store_local'))
-        ];
-
-        if(!$storage['cloud'] && !$storage['local']) {
-            $this->error('Remote avatars are not cached locally, there is nothing to purge. Aborting...');
-            exit;
-        }
-
-        $start = 0;
-
-        if(!$this->confirm('Are you sure you want to proceed?')) {
-            $this->error('Aborting...');
-            exit;
-        }
-
-        if(!$this->activeCheck()) {
-            $this->info('Found existing deep cleaning job');
-            if(!$this->confirm('Do you want to continue where you left off?')) {
-                $this->error('Aborting...');
-                exit;
-            } else {
-                $start = Cache::has('cmd:asdp') ? (int) Cache::get('cmd:asdp') : (int) Storage::get('avatar-deep-clean.json');
-
-                if($start && $start < 1 || $start > PHP_INT_MAX) {
-                    $this->error('Error fetching cached value');
-                    $this->error('Aborting...');
-                    exit;
-                }
-            }
-        }
-
-        $count = Avatar::whereNotNull('cdn_url')->where('is_remote', true)->where('id', '>', $start)->count();
-        $bar = $this->output->createProgressBar($count);
-
-        foreach(Avatar::whereNotNull('cdn_url')->where('is_remote', true)->where('id', '>', $start)->lazyById(10, 'id') as $avatar) {
-            usleep(random_int(50, 1000));
-            $this->counter++;
-            $this->handleAvatar($avatar);
-            $bar->advance();
-        }
-        $bar->finish();
-    }
-
-    protected function updateCache($id)
-    {
-        Cache::put('cmd:asdp', $id);
-        if($this->counter % 5 === 0) {
-            Storage::put('avatar-deep-clean.json', $id);
-        }
-    }
-
-    protected function activeCheck()
-    {
-        if(Storage::exists('avatar-deep-clean.json') || Cache::has('cmd:asdp')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    protected function handleAvatar($avatar)
-    {
-        $this->updateCache($avatar->id);
-        $queues = ['feed', 'mmo', 'feed', 'mmo', 'feed', 'feed', 'mmo', 'low'];
-        $queue = $queues[random_int(0, 7)];
-        AvatarStorageCleanup::dispatch($avatar)->onQueue($queue);
-    }
-}

app/Console/Commands/CloudMediaMigrate.php

@@ -35,16 +35,12 @@ class CloudMediaMigrate extends Command
      */
     public function handle()
     {
-        $enabled = (bool) config_cache('pixelfed.cloud_storage');
+        $enabled = config('pixelfed.cloud_storage');
         if(!$enabled) {
             $this->error('Cloud storage not enabled. Exiting...');
             return;
         }
 
-        if(!$this->confirm('Are you sure you want to proceed?')) {
-            return;
-        }
-
         $limit = $this->option('limit');
         $hugeMode = $this->option('huge');
 

app/Console/Commands/DeleteUserDomainBlock.php

@@ -1,96 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\User;
-use App\Models\DefaultDomainBlock;
-use App\Models\UserDomainBlock;
-use function Laravel\Prompts\text;
-use function Laravel\Prompts\confirm;
-use function Laravel\Prompts\progress;
-
-class DeleteUserDomainBlock extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:delete-user-domain-block';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Remove a domain block for all users';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $domain = text('Enter domain you want to unblock');
-        $domain = strtolower($domain);
-        $domain = $this->validateDomain($domain);
-        if(!$domain || empty($domain)) {
-            $this->error('Invalid domain');
-            return;
-        }
-        $this->processUnblocks($domain);
-        return;
-    }
-
-    protected function validateDomain($domain)
-    {
-        if(!strpos($domain, '.')) {
-            return;
-        }
-
-        if(str_starts_with($domain, 'https://')) {
-            $domain = str_replace('https://', '', $domain);
-        }
-
-        if(str_starts_with($domain, 'http://')) {
-            $domain = str_replace('http://', '', $domain);
-        }
-
-        $domain = strtolower(parse_url('https://' . $domain, PHP_URL_HOST));
-
-        $valid = filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME|FILTER_NULL_ON_FAILURE);
-        if(!$valid) {
-            return;
-        }
-
-        if($domain === config('pixelfed.domain.app')) {
-            return;
-        }
-
-        $confirmed = confirm('Are you sure you want to unblock ' . $domain . '?');
-        if(!$confirmed) {
-            return;
-        }
-
-        return $domain;
-    }
-
-    protected function processUnblocks($domain)
-    {
-        DefaultDomainBlock::whereDomain($domain)->delete();
-        if(!UserDomainBlock::whereDomain($domain)->count()) {
-            $this->info('No results found!');
-            return;
-        }
-        progress(
-            label: 'Updating user domain blocks...',
-            steps: UserDomainBlock::whereDomain($domain)->lazyById(500),
-            callback: fn ($domainBlock) => $this->performTask($domainBlock),
-        );
-    }
-
-    protected function performTask($domainBlock)
-    {
-        $domainBlock->deleteQuietly();
-    }
-}

app/Console/Commands/FetchMissingMediaMimeType.php

@@ -2,11 +2,11 @@
 
 namespace App\Console\Commands;
 
+use Illuminate\Console\Command;
 use App\Media;
+use Illuminate\Support\Facades\Http;
 use App\Services\MediaService;
 use App\Services\StatusService;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Http;
 
 class FetchMissingMediaMimeType extends Command
 {
@@ -29,20 +29,20 @@ class FetchMissingMediaMimeType extends Command
      */
     public function handle()
     {
-        foreach (Media::whereNotNull(['remote_url', 'status_id'])->whereNull('mime')->lazyByIdDesc(50, 'id') as $media) {
+        foreach(Media::whereNotNull(['remote_url', 'status_id'])->whereNull('mime')->lazyByIdDesc(50, 'id') as $media) {
             $res = Http::retry(2, 100, throw: false)->head($media->remote_url);
 
-            if (! $res->successful()) {
+            if(!$res->successful()) {
                 continue;
             }
 
-            if (! in_array($res->header('content-type'), explode(',', config_cache('pixelfed.media_types')))) {
+            if(!in_array($res->header('content-type'), explode(',',config('pixelfed.media_types')))) {
                 continue;
             }
 
             $media->mime = $res->header('content-type');
 
-            if ($res->hasHeader('content-length')) {
+            if($res->hasHeader('content-length')) {
                 $media->size = $res->header('content-length');
             }
 
@@ -50,7 +50,7 @@ class FetchMissingMediaMimeType extends Command
 
             MediaService::del($media->status_id);
             StatusService::del($media->status_id);
-            $this->info('mid:'.$media->id.' ('.$res->header('content-type').':'.$res->header('content-length').' bytes)');
+            $this->info('mid:'.$media->id . ' (' . $res->header('content-type') . ':' . $res->header('content-length') . ' bytes)');
         }
     }
 }

app/Console/Commands/FixMediaDriver.php

@@ -37,7 +37,7 @@ class FixMediaDriver extends Command
 			return Command::SUCCESS;
 		}
 
-		if((bool) config_cache('pixelfed.cloud_storage') == false) {
+		if(config_cache('pixelfed.cloud_storage') == false) {
 			$this->error('Cloud storage not enabled, exiting...');
 			return Command::SUCCESS;
 		}

app/Console/Commands/HashtagCachedCountUpdate.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Hashtag;
-use App\StatusHashtag;
-use DB;
-
-class HashtagCachedCountUpdate extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:hashtag-cached-count-update {--limit=100}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Update cached counter of hashtags';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $limit = $this->option('limit');
-        $tags = Hashtag::whereNull('cached_count')->limit($limit)->get();
-        $count = count($tags);
-        if(!$count) {
-            return;
-        }
-
-        $bar = $this->output->createProgressBar($count);
-        $bar->start();
-
-        foreach($tags as $tag) {
-            $count = DB::table('status_hashtags')->whereHashtagId($tag->id)->count();
-            if(!$count) {
-                $tag->cached_count = 0;
-                $tag->saveQuietly();
-                $bar->advance();
-                continue;
-            }
-            $tag->cached_count = $count;
-            $tag->saveQuietly();
-            $bar->advance();
-        }
-        $bar->finish();
-        $this->line(' ');
-        return;
-    }
-}

app/Console/Commands/HashtagRelatedGenerate.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Hashtag;
-use App\StatusHashtag;
-use App\Models\HashtagRelated;
-use App\Services\HashtagRelatedService;
-use Illuminate\Contracts\Console\PromptsForMissingInput;
-use function Laravel\Prompts\multiselect;
-use function Laravel\Prompts\confirm;
-
-class HashtagRelatedGenerate extends Command implements PromptsForMissingInput
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:hashtag-related-generate {tag}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Command description';
-
-    /**
-     * Prompt for missing input arguments using the returned questions.
-     *
-     * @return array
-     */
-    protected function promptForMissingArgumentsUsing()
-    {
-        return [
-            'tag' => 'Which hashtag should we generate related tags for?',
-        ];
-    }
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $tag = $this->argument('tag');
-        $hashtag = Hashtag::whereName($tag)->orWhere('slug', $tag)->first();
-        if(!$hashtag) {
-            $this->error('Hashtag not found, aborting...');
-            exit;
-        }
-
-        $exists = HashtagRelated::whereHashtagId($hashtag->id)->exists();
-
-        if($exists) {
-            $confirmed = confirm('Found existing related tags, do you want to regenerate them?');
-            if(!$confirmed) {
-                $this->error('Aborting...');
-                exit;
-            }
-        }
-
-        $this->info('Looking up #' . $tag . '...');
-
-        $tags = StatusHashtag::whereHashtagId($hashtag->id)->count();
-        if(!$tags || $tags < 100) {
-            $this->error('Not enough posts found to generate related hashtags!');
-            exit;
-        }
-
-        $this->info('Found ' . $tags . ' posts that use that hashtag');
-        $related = collect(HashtagRelatedService::fetchRelatedTags($tag));
-
-        $selected = multiselect(
-            label: 'Which tags do you want to generate?',
-            options: $related->pluck('name'),
-            required: true,
-        );
-
-        $filtered = $related->filter(fn($i) => in_array($i['name'], $selected))->all();
-        $agg_score = $related->filter(fn($i) => in_array($i['name'], $selected))->sum('related_count');
-
-        HashtagRelated::updateOrCreate([
-            'hashtag_id' => $hashtag->id,
-        ], [
-            'related_tags' => array_values($filtered),
-            'agg_score' => $agg_score,
-            'last_calculated_at' => now()
-        ]);
-
-        $this->info('Finished!');
-    }
-}

app/Console/Commands/ImportEmojis.php

@@ -1,118 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\CustomEmoji;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Storage;
-
-class ImportEmojis extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'import:emojis
-                            {path : Path to a tar.gz archive with the emojis}
-                            {--prefix : Define a prefix for the emjoi shortcode}
-                            {--suffix : Define a suffix for the emjoi shortcode}
-                            {--overwrite : Overwrite existing emojis}
-                            {--disabled : Import all emojis as disabled}';
-
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Import emojis to the database';
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $path = $this->argument('path');
-
-        if (!file_exists($path) || !mime_content_type($path) == 'application/x-tar') {
-            $this->error('Path does not exist or is not a tarfile');
-            return Command::FAILURE;
-        }
-
-        $imported = 0;
-        $skipped = 0;
-        $failed = 0;
-
-        $tar = new \PharData($path);
-        $tar->decompress();
-
-        foreach (new \RecursiveIteratorIterator($tar) as $entry) {
-            $this->line("Processing {$entry->getFilename()}");
-            if (!$entry->isFile() || !$this->isImage($entry) || !$this->isEmoji($entry->getPathname())) {
-                $failed++;
-                continue;
-            }
-
-            $filename = pathinfo($entry->getFilename(), PATHINFO_FILENAME);
-            $extension = pathinfo($entry->getFilename(), PATHINFO_EXTENSION);
-
-            // Skip macOS shadow files
-            if (str_starts_with($filename, '._')) {
-                continue;
-            }
-
-            $shortcode = implode('', [
-                $this->option('prefix'),
-                $filename,
-                $this->option('suffix'),
-            ]);
-
-            $customEmoji = CustomEmoji::whereShortcode($shortcode)->first();
-
-            if ($customEmoji && !$this->option('overwrite')) {
-                $skipped++;
-                continue;
-            }
-
-            $emoji = $customEmoji ?? new CustomEmoji();
-            $emoji->shortcode = $shortcode;
-            $emoji->domain = config('pixelfed.domain.app');
-            $emoji->disabled = $this->option('disabled');
-            $emoji->save();
-
-            $fileName = $emoji->id . '.' . $extension;
-            Storage::putFileAs('public/emoji', $entry->getPathname(), $fileName);
-            $emoji->media_path = 'emoji/' . $fileName;
-            $emoji->save();
-            $imported++;
-            Cache::forget('pf:custom_emoji');
-        }
-
-        $this->line("Imported: {$imported}");
-        $this->line("Skipped: {$skipped}");
-        $this->line("Failed: {$failed}");
-
-        //delete file
-        unlink(str_replace('.tar.gz', '.tar', $path));
-
-        return Command::SUCCESS;
-    }
-
-    private function isImage($file)
-    {
-        $image = getimagesize($file->getPathname());
-        return $image !== false;
-    }
-
-    private function isEmoji($filename)
-    {
-        $allowedMimeTypes = ['image/png', 'image/jpeg', 'image/webp'];
-        $mimeType = mime_content_type($filename);
-
-        return in_array($mimeType, $allowedMimeTypes);
-    }
-}

app/Console/Commands/ImportUploadMediaToCloudStorage.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Models\ImportPost;
-use App\Jobs\ImportPipeline\ImportMediaToCloudPipeline;
-use function Laravel\Prompts\progress;
-
-class ImportUploadMediaToCloudStorage extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:import-upload-media-to-cloud-storage {--limit=500}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Migrate media imported from Instagram to S3 cloud storage.';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        if(
-            (bool) config('import.instagram.storage.cloud.enabled') === false ||
-            (bool) config_cache('pixelfed.cloud_storage') === false
-        ) {
-            $this->error('Aborted. Cloud storage is not enabled for IG imports.');
-            return;
-        }
-
-        $limit = $this->option('limit');
-
-        $progress = progress(label: 'Migrating import media', steps: $limit);
-
-        $progress->start();
-
-        $posts = ImportPost::whereUploadedToS3(false)->take($limit)->get();
-
-        foreach($posts as $post) {
-            ImportMediaToCloudPipeline::dispatch($post)->onQueue('low');
-            $progress->advance();
-        }
-
-        $progress->finish();
-    }
-}

app/Console/Commands/InstanceManager.php

@@ -1,298 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Instance;
-use App\Profile;
-use App\Services\InstanceService;
-use App\Jobs\InstancePipeline\FetchNodeinfoPipeline;
-use function Laravel\Prompts\select;
-use function Laravel\Prompts\confirm;
-use function Laravel\Prompts\progress;
-use function Laravel\Prompts\search;
-use function Laravel\Prompts\table;
-
-class InstanceManager extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:instance-manager';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Manage Instances';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $action = select(
-            'What action do you want to perform?',
-            [
-                'Recalculate Stats',
-                'Ban Instance',
-                'Unlist Instance',
-                'Unlisted Instances',
-                'Banned Instances',
-                'Unban Instance',
-                'Relist Instance',
-            ],
-        );
-
-        switch($action) {
-            case 'Recalculate Stats':
-                return $this->recalculateStats();
-            break;
-
-            case 'Unlisted Instances':
-                return $this->viewUnlistedInstances();
-            break;
-
-            case 'Banned Instances':
-                return $this->viewBannedInstances();
-            break;
-
-            case 'Unlist Instance':
-                return $this->unlistInstance();
-            break;
-
-            case 'Ban Instance':
-                return $this->banInstance();
-            break;
-
-            case 'Unban Instance':
-                return $this->unbanInstance();
-            break;
-
-            case 'Relist Instance':
-                return $this->relistInstance();
-            break;
-        }
-    }
-
-    protected function recalculateStats()
-    {
-        $instanceCount = Instance::count();
-        $confirmed = confirm('Do you want to recalculate stats for all ' . $instanceCount . ' instances?');
-        if(!$confirmed) {
-            $this->error('Aborting...');
-            exit;
-        }
-
-        $users = progress(
-            label: 'Updating instance stats...',
-            steps: Instance::all(),
-            callback: fn ($instance) => $this->updateInstanceStats($instance),
-        );
-    }
-
-    protected function updateInstanceStats($instance)
-    {
-        FetchNodeinfoPipeline::dispatch($instance)->onQueue('intbg');
-    }
-
-    protected function unlistInstance()
-    {
-        $id = search(
-            'Search by domain',
-            fn (string $value) => strlen($value) > 0
-                ? Instance::whereUnlisted(false)->where('domain', 'like', "%{$value}%")->pluck('domain', 'id')->all()
-                : []
-        );
-
-        $instance = Instance::find($id);
-        if(!$instance) {
-            $this->error('Oops, an error occured');
-            exit;
-        }
-
-        $tbl = [
-            [
-                $instance->domain,
-                number_format($instance->status_count),
-                number_format($instance->user_count),
-            ]
-        ];
-        table(
-            ['Domain', 'Status Count', 'User Count'],
-            $tbl
-        );
-
-        $confirmed = confirm('Are you sure you want to unlist this instance?');
-        if(!$confirmed) {
-            $this->error('Aborting instance unlisting');
-            exit;
-        }
-
-        $instance->unlisted = true;
-        $instance->save();
-        InstanceService::refresh();
-        $this->info('Successfully unlisted ' . $instance->domain . '!');
-        exit;
-    }
-
-    protected function relistInstance()
-    {
-        $id = search(
-            'Search by domain',
-            fn (string $value) => strlen($value) > 0
-                ? Instance::whereUnlisted(true)->where('domain', 'like', "%{$value}%")->pluck('domain', 'id')->all()
-                : []
-        );
-
-        $instance = Instance::find($id);
-        if(!$instance) {
-            $this->error('Oops, an error occured');
-            exit;
-        }
-
-        $tbl = [
-            [
-                $instance->domain,
-                number_format($instance->status_count),
-                number_format($instance->user_count),
-            ]
-        ];
-        table(
-            ['Domain', 'Status Count', 'User Count'],
-            $tbl
-        );
-
-        $confirmed = confirm('Are you sure you want to re-list this instance?');
-        if(!$confirmed) {
-            $this->error('Aborting instance re-listing');
-            exit;
-        }
-
-        $instance->unlisted = false;
-        $instance->save();
-        InstanceService::refresh();
-        $this->info('Successfully re-listed ' . $instance->domain . '!');
-        exit;
-    }
-
-    protected function banInstance()
-    {
-        $id = search(
-            'Search by domain',
-            fn (string $value) => strlen($value) > 0
-                ? Instance::whereBanned(false)->where('domain', 'like', "%{$value}%")->pluck('domain', 'id')->all()
-                : []
-        );
-
-        $instance = Instance::find($id);
-        if(!$instance) {
-            $this->error('Oops, an error occured');
-            exit;
-        }
-
-        $tbl = [
-            [
-                $instance->domain,
-                number_format($instance->status_count),
-                number_format($instance->user_count),
-            ]
-        ];
-        table(
-            ['Domain', 'Status Count', 'User Count'],
-            $tbl
-        );
-
-        $confirmed = confirm('Are you sure you want to ban this instance?');
-        if(!$confirmed) {
-            $this->error('Aborting instance ban');
-            exit;
-        }
-
-        $instance->banned = true;
-        $instance->save();
-        InstanceService::refresh();
-        $this->info('Successfully banned ' . $instance->domain . '!');
-        exit;
-    }
-
-    protected function unbanInstance()
-    {
-        $id = search(
-            'Search by domain',
-            fn (string $value) => strlen($value) > 0
-                ? Instance::whereBanned(true)->where('domain', 'like', "%{$value}%")->pluck('domain', 'id')->all()
-                : []
-        );
-
-        $instance = Instance::find($id);
-        if(!$instance) {
-            $this->error('Oops, an error occured');
-            exit;
-        }
-
-        $tbl = [
-            [
-                $instance->domain,
-                number_format($instance->status_count),
-                number_format($instance->user_count),
-            ]
-        ];
-        table(
-            ['Domain', 'Status Count', 'User Count'],
-            $tbl
-        );
-
-        $confirmed = confirm('Are you sure you want to unban this instance?');
-        if(!$confirmed) {
-            $this->error('Aborting instance unban');
-            exit;
-        }
-
-        $instance->banned = false;
-        $instance->save();
-        InstanceService::refresh();
-        $this->info('Successfully un-banned ' . $instance->domain . '!');
-        exit;
-    }
-
-    protected function viewBannedInstances()
-    {
-        $data = Instance::whereBanned(true)
-            ->get(['domain', 'user_count', 'status_count'])
-            ->map(function($d) {
-                return [
-                    'domain' => $d->domain,
-                    'user_count' => number_format($d->user_count),
-                    'status_count' => number_format($d->status_count),
-                ];
-            })
-            ->toArray();
-        table(
-            ['Domain', 'User Count', 'Status Count'],
-            $data
-        );
-    }
-
-    protected function viewUnlistedInstances()
-    {
-        $data = Instance::whereUnlisted(true)
-            ->get(['domain', 'user_count', 'status_count', 'banned'])
-            ->map(function($d) {
-                return [
-                    'domain' => $d->domain,
-                    'user_count' => number_format($d->user_count),
-                    'status_count' => number_format($d->status_count),
-                    'banned' => $d->banned ? '✅' : null
-                ];
-            })
-            ->toArray();
-        table(
-            ['Domain', 'User Count', 'Status Count', 'Banned'],
-            $data
-        );
-    }
-}

app/Console/Commands/MediaCloudUrlRewrite.php

@@ -1,140 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Media;
-use Cache, Storage;
-use Illuminate\Contracts\Console\PromptsForMissingInput;
-
-class MediaCloudUrlRewrite extends Command implements PromptsForMissingInput
-{
-    /**
-    * The name and signature of the console command.
-    *
-    * @var string
-    */
-    protected $signature = 'media:cloud-url-rewrite {oldDomain} {newDomain}';
-
-    /**
-    * Prompt for missing input arguments using the returned questions.
-    *
-    * @return array
-    */
-    protected function promptForMissingArgumentsUsing()
-    {
-        return [
-            'oldDomain' => 'The old S3 domain',
-            'newDomain' => 'The new S3 domain'
-        ];
-    }
-    /**
-    * The console command description.
-    *
-    * @var string
-    */
-    protected $description = 'Rewrite S3 media urls from local users';
-
-    /**
-    * Execute the console command.
-    */
-    public function handle()
-    {
-        $this->preflightCheck();
-        $this->bootMessage();
-        $this->confirmCloudUrl();
-    }
-
-    protected function preflightCheck()
-    {
-        if(!(bool) config_cache('pixelfed.cloud_storage')) {
-            $this->info('Error: Cloud storage is not enabled!');
-            $this->error('Aborting...');
-            exit;
-        }
-    }
-
-    protected function bootMessage()
-    {
-        $this->info('       ____  _           ______         __  ');
-        $this->info('      / __ \(_)  _____  / / __/__  ____/ /  ');
-        $this->info('     / /_/ / / |/_/ _ \/ / /_/ _ \/ __  /   ');
-        $this->info('    / ____/ />  </  __/ / __/  __/ /_/ /    ');
-        $this->info('   /_/   /_/_/|_|\___/_/_/  \___/\__,_/     ');
-        $this->info(' ');
-        $this->info('    Media Cloud Url Rewrite Tool');
-        $this->info('    ===');
-        $this->info('    Old S3: ' . trim($this->argument('oldDomain')));
-        $this->info('    New S3: ' . trim($this->argument('newDomain')));
-        $this->info(' ');
-    }
-
-    protected function confirmCloudUrl()
-    {
-        $disk = Storage::disk(config('filesystems.cloud'))->url('test');
-        $domain = parse_url($disk, PHP_URL_HOST);
-        if(trim($this->argument('newDomain')) !== $domain) {
-            $this->error('Error: The new S3 domain you entered is not currently configured');
-            exit;
-        }
-
-        if(!$this->confirm('Confirm this is correct')) {
-            $this->error('Aborting...');
-            exit;
-        }
-
-        $this->updateUrls();
-    }
-
-    protected function updateUrls()
-    {
-        $this->info('Updating urls...');
-        $oldDomain = trim($this->argument('oldDomain'));
-        $newDomain = trim($this->argument('newDomain'));
-        $disk = Storage::disk(config('filesystems.cloud'));
-        $count = Media::whereNotNull('cdn_url')->count();
-        $bar = $this->output->createProgressBar($count);
-        $counter = 0;
-        $bar->start();
-        foreach(Media::whereNotNull('cdn_url')->lazyById(1000, 'id') as $media) {
-            if(strncmp($media->media_path, 'http', 4) === 0) {
-                $bar->advance();
-                continue;
-            }
-            $cdnHost = parse_url($media->cdn_url, PHP_URL_HOST);
-            if($oldDomain != $cdnHost || $newDomain == $cdnHost) {
-                $bar->advance();
-                continue;
-            }
-
-            $media->cdn_url = str_replace($oldDomain, $newDomain, $media->cdn_url);
-
-            if($media->thumbnail_url != null) {
-                $thumbHost = parse_url($media->thumbnail_url, PHP_URL_HOST);
-                if($thumbHost == $oldDomain) {
-                    $thumbUrl = $disk->url($media->thumbnail_path);
-                    $media->thumbnail_url = $thumbUrl;
-                }
-            }
-
-            if($media->optimized_url != null) {
-                $optiHost = parse_url($media->optimized_url, PHP_URL_HOST);
-                if($optiHost == $oldDomain) {
-                    $optiUrl = str_replace($oldDomain, $newDomain, $media->optimized_url);
-                    $media->optimized_url = $optiUrl;
-                }
-            }
-
-            $media->save();
-            $counter++;
-            $bar->advance();
-        }
-
-        $bar->finish();
-
-        $this->line(' ');
-        $this->info('Finished! Updated ' . $counter . ' total records!');
-        $this->line(' ');
-        $this->info('Tip: Run `php artisan cache:clear` to purge cached urls');
-    }
-}

app/Console/Commands/MediaS3GarbageCollector.php

@@ -45,7 +45,7 @@ class MediaS3GarbageCollector extends Command
     */
     public function handle()
     {
-        $enabled = (bool) config_cache('pixelfed.cloud_storage');
+        $enabled = in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']);
         if(!$enabled) {
             $this->error('Cloud storage not enabled. Exiting...');
             return;

app/Console/Commands/NotificationEpochUpdate.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Jobs\InternalPipeline\NotificationEpochUpdatePipeline;
-
-class NotificationEpochUpdate extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:notification-epoch-update';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Update notification epoch';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        NotificationEpochUpdatePipeline::dispatch();
-    }
-}

app/Console/Commands/SoftwareUpdateRefresh.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Services\Internal\SoftwareUpdateService;
-use Cache;
-
-class SoftwareUpdateRefresh extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:software-update-refresh';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Refresh latest software version data';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $key = SoftwareUpdateService::cacheKey();
-        Cache::forget($key);
-        Cache::remember($key, 1209600, function() {
-            return SoftwareUpdateService::fetchLatest();
-        });
-        $this->info('Succesfully updated software versions!');
-    }
-}

app/Console/Commands/TransformImports.php

@@ -70,11 +70,6 @@ class TransformImports extends Command
             }
 
             $idk = ImportService::getId($ip->user_id, $ip->creation_year, $ip->creation_month, $ip->creation_day);
-            if(!$idk) {
-                $ip->skip_missing_media = true;
-                $ip->save();
-                continue;
-            }
 
             if(Storage::exists('imports/' . $id . '/' . $ip->filename) === false) {
                 ImportService::clearAttempts($profile->id);

app/Console/Commands/UserAccountDelete.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Instance;
-use App\Profile;
-use App\Transformer\ActivityPub\Verb\DeleteActor;
-use App\User;
-use App\Util\ActivityPub\HttpSignature;
-use GuzzleHttp\Client;
-use GuzzleHttp\Pool;
-use Illuminate\Console\Command;
-use League\Fractal;
-use League\Fractal\Serializer\ArraySerializer;
-
-use function Laravel\Prompts\confirm;
-use function Laravel\Prompts\search;
-use function Laravel\Prompts\table;
-
-class UserAccountDelete extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:user-account-delete';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Federate Account Deletion';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $id = search(
-            label: 'Search for the account to delete by username',
-            placeholder: 'john.appleseed',
-            options: fn (string $value) => strlen($value) > 0
-                ? User::withTrashed()->whereStatus('deleted')->where('username', 'like', "%{$value}%")->pluck('username', 'id')->all()
-                : [],
-        );
-
-        $user = User::withTrashed()->find($id);
-
-        table(
-            ['Username', 'Name', 'Email', 'Created'],
-            [[$user->username, $user->name, $user->email, $user->created_at]]
-        );
-
-        $confirmed = confirm(
-            label: 'Do you want to federate this account deletion?',
-            default: false,
-            yes: 'Proceed',
-            no: 'Cancel',
-            hint: 'This action is irreversible'
-        );
-
-        if (! $confirmed) {
-            $this->error('Aborting...');
-            exit;
-        }
-
-        $profile = Profile::withTrashed()->find($user->profile_id);
-
-        $fractal = new Fractal\Manager();
-        $fractal->setSerializer(new ArraySerializer());
-        $resource = new Fractal\Resource\Item($profile, new DeleteActor());
-        $activity = $fractal->createData($resource)->toArray();
-
-        $audience = Instance::whereNotNull(['shared_inbox', 'nodeinfo_last_fetched'])
-            ->where('nodeinfo_last_fetched', '>', now()->subHours(12))
-            ->distinct()
-            ->pluck('shared_inbox');
-
-        $payload = json_encode($activity);
-
-        $client = new Client([
-            'timeout' => 10,
-        ]);
-
-        $version = config('pixelfed.version');
-        $appUrl = config('app.url');
-        $userAgent = "(Pixelfed/{$version}; +{$appUrl})";
-
-        $requests = function ($audience) use ($client, $activity, $profile, $payload, $userAgent) {
-            foreach ($audience as $url) {
-                $headers = HttpSignature::sign($profile, $url, $activity, [
-                    'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
-                    'User-Agent' => $userAgent,
-                ]);
-                yield function () use ($client, $url, $headers, $payload) {
-                    return $client->postAsync($url, [
-                        'curl' => [
-                            CURLOPT_HTTPHEADER => $headers,
-                            CURLOPT_POSTFIELDS => $payload,
-                            CURLOPT_HEADER => true,
-                            CURLOPT_SSL_VERIFYPEER => false,
-                            CURLOPT_SSL_VERIFYHOST => false,
-                        ],
-                    ]);
-                };
-            }
-        };
-
-        $pool = new Pool($client, $requests($audience), [
-            'concurrency' => 50,
-            'fulfilled' => function ($response, $index) {
-            },
-            'rejected' => function ($reason, $index) {
-            },
-        ]);
-
-        $promise = $pool->promise();
-
-        $promise->wait();
-    }
-}

app/Console/Commands/UserAdmin.php

@@ -3,17 +3,16 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\PromptsForMissingInput;
 use App\User;
 
-class UserAdmin extends Command implements PromptsForMissingInput
+class UserAdmin extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'user:admin {username}';
+    protected $signature = 'user:admin {id}';
 
     /**
      * The console command description.
@@ -23,15 +22,13 @@ class UserAdmin extends Command implements PromptsForMissingInput
     protected $description = 'Make a user an admin, or remove admin privileges.';
 
     /**
-     * Prompt for missing input arguments using the returned questions.
+     * Create a new command instance.
      *
-     * @return array
+     * @return void
      */
-    protected function promptForMissingArgumentsUsing()
+    public function __construct()
     {
-        return [
-            'username' => 'Which username should we toggle admin privileges for?',
-        ];
+        parent::__construct();
     }
 
     /**
@@ -41,15 +38,16 @@ class UserAdmin extends Command implements PromptsForMissingInput
      */
     public function handle()
     {
-        $id = $this->argument('username');
-
-        $user = User::whereUsername($id)->first();
-
+        $id = $this->argument('id');
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             exit;
         }
-
         $this->info('Found username: ' . $user->username);
         $state = $user->is_admin ? 'Remove admin privileges from this user?' : 'Add admin privileges to this user?';
         $confirmed = $this->confirm($state);

app/Console/Commands/UserToggle2FA.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\PromptsForMissingInput;
-use App\User;
-
-class UserToggle2FA extends Command implements PromptsForMissingInput
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'user:2fa {username}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Disable two factor authentication for given username';
-
-    /**
-     * Prompt for missing input arguments using the returned questions.
-     *
-     * @return array
-     */
-    protected function promptForMissingArgumentsUsing()
-    {
-        return [
-            'username' => 'Which username should we disable 2FA for?',
-        ];
-    }
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $user = User::whereUsername($this->argument('username'))->first();
-
-        if(!$user) {
-            $this->error('Could not find any user with that username');
-            exit;
-        }
-
-        if(!$user->{'2fa_enabled'}) {
-            $this->info('User did not have 2FA enabled!');
-            return;
-        }
-
-        $user->{'2fa_enabled'} = false;
-        $user->{'2fa_secret'} = null;
-        $user->{'2fa_backup_codes'} = null;
-        $user->save();
-
-        $this->info('Successfully disabled 2FA on this account!');
-    }
-}

app/Console/Kernel.php

@@ -25,32 +25,24 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command('media:optimize')->hourlyAt(40)->onOneServer();
-        $schedule->command('media:gc')->hourlyAt(5)->onOneServer();
-        $schedule->command('horizon:snapshot')->everyFiveMinutes()->onOneServer();
-        $schedule->command('story:gc')->everyFiveMinutes()->onOneServer();
-        $schedule->command('gc:failedjobs')->dailyAt(3)->onOneServer();
-        $schedule->command('gc:passwordreset')->dailyAt('09:41')->onOneServer();
-        $schedule->command('gc:sessions')->twiceDaily(13, 23)->onOneServer();
+        $schedule->command('media:optimize')->hourlyAt(40);
+        $schedule->command('media:gc')->hourlyAt(5);
+        $schedule->command('horizon:snapshot')->everyFiveMinutes();
+        $schedule->command('story:gc')->everyFiveMinutes();
+        $schedule->command('gc:failedjobs')->dailyAt(3);
+        $schedule->command('gc:passwordreset')->dailyAt('09:41');
+        $schedule->command('gc:sessions')->twiceDaily(13, 23);
 
-        if ((bool) config_cache('pixelfed.cloud_storage') && (bool) config_cache('media.delete_local_after_cloud')) {
+        if(in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']) && config('media.delete_local_after_cloud')) {
             $schedule->command('media:s3gc')->hourlyAt(15);
         }
 
-        if (config('import.instagram.enabled')) {
-            $schedule->command('app:transform-imports')->everyTenMinutes()->onOneServer();
-            $schedule->command('app:import-upload-garbage-collection')->hourlyAt(51)->onOneServer();
-            $schedule->command('app:import-remove-deleted-accounts')->hourlyAt(37)->onOneServer();
-            $schedule->command('app:import-upload-clean-storage')->twiceDailyAt(1, 13, 32)->onOneServer();
-
-            if (config('import.instagram.storage.cloud.enabled') && (bool) config_cache('pixelfed.cloud_storage')) {
-                $schedule->command('app:import-upload-media-to-cloud-storage')->hourlyAt(39)->onOneServer();
-            }
+        if(config('import.instagram.enabled')) {
+            $schedule->command('app:transform-imports')->everyFourMinutes();
+            $schedule->command('app:import-upload-garbage-collection')->hourlyAt(51);
+            $schedule->command('app:import-remove-deleted-accounts')->hourlyAt(37);
+            $schedule->command('app:import-upload-clean-storage')->twiceDailyAt(1, 13, 32);
         }
-
-        $schedule->command('app:notification-epoch-update')->weeklyOn(1, '2:21')->onOneServer();
-        $schedule->command('app:hashtag-cached-count-update')->hourlyAt(25)->onOneServer();
-        $schedule->command('app:account-post-count-stat-update')->everySixHours(25)->onOneServer();
     }
 
     /**
@@ -60,7 +52,7 @@ class Kernel extends ConsoleKernel
      */
     protected function commands()
     {
-        $this->load(__DIR__ . '/Commands');
+        $this->load(__DIR__.'/Commands');
 
         require base_path('routes/console.php');
     }

app/Http/Controllers/AccountController.php

@@ -157,7 +157,7 @@ class AccountController extends Controller
 
 		$pid = $request->user()->profile_id;
 		$count = UserFilterService::muteCount($pid);
-		$maxLimit = (int) config_cache('instance.user_filters.max_user_mutes');
+		$maxLimit = intval(config('instance.user_filters.max_user_mutes'));
 		abort_if($count >= $maxLimit, 422, self::FILTER_LIMIT_MUTE_TEXT . $maxLimit . ' accounts');
 		if($count == 0) {
 			$filterCount = UserFilter::whereUserId($pid)->count();
@@ -260,7 +260,7 @@ class AccountController extends Controller
 		]);
 		$pid = $request->user()->profile_id;
 		$count = UserFilterService::blockCount($pid);
-		$maxLimit = (int) config_cache('instance.user_filters.max_user_blocks');
+		$maxLimit = intval(config('instance.user_filters.max_user_blocks'));
 		abort_if($count >= $maxLimit, 422, self::FILTER_LIMIT_BLOCK_TEXT . $maxLimit . ' accounts');
 		if($count == 0) {
 			$filterCount = UserFilter::whereUserId($pid)->whereFilterType('block')->count();

app/Http/Controllers/Admin/AdminDirectoryController.php

@@ -2,20 +2,30 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Http\Controllers\PixelfedDirectoryController;
+use DB, Cache;
+use App\{
+    DiscoverCategory,
+    DiscoverCategoryHashtag,
+    Hashtag,
+    Media,
+    Profile,
+    Status,
+    StatusHashtag,
+    User
+};
 use App\Models\ConfigCache;
 use App\Services\AccountService;
 use App\Services\ConfigCacheService;
 use App\Services\StatusService;
-use App\Status;
-use App\User;
-use Cache;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Http;
+use Illuminate\Validation\Rule;
+use League\ISO3166\ISO3166;
+use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Str;
-use League\ISO3166\ISO3166;
+use Illuminate\Support\Facades\Http;
+use App\Http\Controllers\PixelfedDirectoryController;
 
 trait AdminDirectoryController
 {
@@ -31,41 +41,40 @@ trait AdminDirectoryController
         $res['countries'] = collect((new ISO3166)->all())->pluck('name');
         $res['admins'] = User::whereIsAdmin(true)
             ->where('2fa_enabled', true)
-            ->get()->map(function ($user) {
-                return [
-                    'uid' => (string) $user->id,
-                    'pid' => (string) $user->profile_id,
-                    'username' => $user->username,
-                    'created_at' => $user->created_at,
-                ];
-            });
+            ->get()->map(function($user) {
+            return [
+                'uid' => (string) $user->id,
+                'pid' => (string) $user->profile_id,
+                'username' => $user->username,
+                'created_at' => $user->created_at
+            ];
+        });
         $config = ConfigCache::whereK('pixelfed.directory')->first();
-        if ($config) {
+        if($config) {
             $data = $config->v ? json_decode($config->v, true) : [];
             $res = array_merge($res, $data);
         }
 
-        if (empty($res['summary'])) {
+        if(empty($res['summary'])) {
             $summary = ConfigCache::whereK('app.short_description')->pluck('v');
             $res['summary'] = $summary ? $summary[0] : null;
         }
 
-        if (isset($res['banner_image']) && ! empty($res['banner_image'])) {
+        if(isset($res['banner_image']) && !empty($res['banner_image'])) {
             $res['banner_image'] = url(Storage::url($res['banner_image']));
         }
 
-        if (isset($res['favourite_posts'])) {
-            $res['favourite_posts'] = collect($res['favourite_posts'])->map(function ($id) {
+        if(isset($res['favourite_posts'])) {
+            $res['favourite_posts'] = collect($res['favourite_posts'])->map(function($id) {
                 return StatusService::get($id);
             })
-                ->filter(function ($post) {
-                    return $post && isset($post['account']);
-                })
-                ->values();
+            ->filter(function($post) {
+                return $post && isset($post['account']);
+            })
+            ->values();
         }
 
         $res['community_guidelines'] = config_cache('app.rules') ? json_decode(config_cache('app.rules'), true) : [];
-        $res['curated_onboarding'] = (bool) config_cache('instance.curated_registration.enabled');
         $res['open_registration'] = (bool) config_cache('pixelfed.open_registration');
         $res['oauth_enabled'] = (bool) config_cache('pixelfed.oauth_enabled') && file_exists(storage_path('oauth-public.key')) && file_exists(storage_path('oauth-private.key'));
 
@@ -74,22 +83,22 @@ trait AdminDirectoryController
         $res['feature_config'] = [
             'media_types' => Str::of(config_cache('pixelfed.media_types'))->explode(','),
             'image_quality' => config_cache('pixelfed.image_quality'),
-            'optimize_image' => (bool) config_cache('pixelfed.optimize_image'),
+            'optimize_image' => config_cache('pixelfed.optimize_image'),
             'max_photo_size' => config_cache('pixelfed.max_photo_size'),
             'max_caption_length' => config_cache('pixelfed.max_caption_length'),
             'max_altext_length' => config_cache('pixelfed.max_altext_length'),
-            'enforce_account_limit' => (bool) config_cache('pixelfed.enforce_account_limit'),
+            'enforce_account_limit' => config_cache('pixelfed.enforce_account_limit'),
             'max_account_size' => config_cache('pixelfed.max_account_size'),
             'max_album_length' => config_cache('pixelfed.max_album_length'),
-            'account_deletion' => (bool) config_cache('pixelfed.account_deletion'),
+            'account_deletion' => config_cache('pixelfed.account_deletion'),
         ];
 
-        if (config_cache('pixelfed.directory.testimonials')) {
-            $testimonials = collect(json_decode(config_cache('pixelfed.directory.testimonials'), true))
-                ->map(function ($t) {
+        if(config_cache('pixelfed.directory.testimonials')) {
+            $testimonials = collect(json_decode(config_cache('pixelfed.directory.testimonials'),true))
+                ->map(function($t) {
                     return [
                         'profile' => AccountService::get($t['profile_id']),
-                        'body' => $t['body'],
+                        'body' => $t['body']
                     ];
                 });
             $res['testimonials'] = $testimonials;
@@ -98,8 +107,8 @@ trait AdminDirectoryController
         $validator = Validator::make($res['feature_config'], [
             'media_types' => [
                 'required',
-                function ($attribute, $value, $fail) {
-                    if (! in_array('image/jpeg', $value->toArray()) || ! in_array('image/png', $value->toArray())) {
+                 function ($attribute, $value, $fail) {
+                    if (!in_array('image/jpeg', $value->toArray()) || !in_array('image/png', $value->toArray())) {
                         $fail('You must enable image/jpeg and image/png support.');
                     }
                 },
@@ -110,12 +119,12 @@ trait AdminDirectoryController
             'max_account_size' => 'required_if:enforce_account_limit,true|integer|min:1000000',
             'max_album_length' => 'required|integer|min:4|max:20',
             'account_deletion' => 'required|accepted',
-            'max_caption_length' => 'required|integer|min:500|max:10000',
+            'max_caption_length' => 'required|integer|min:500|max:10000'
         ]);
 
         $res['requirements_validator'] = $validator->errors();
 
-        $res['is_eligible'] = ($res['open_registration'] || $res['curated_onboarding']) &&
+        $res['is_eligible'] = $res['open_registration'] &&
             $res['oauth_enabled'] &&
             $res['activitypub_enabled'] &&
             count($res['requirements_validator']) === 0 &&
@@ -136,11 +145,11 @@ trait AdminDirectoryController
         foreach (new \DirectoryIterator($path) as $io) {
             $name = $io->getFilename();
             $skip = ['vendor'];
-            if ($io->isDot() || in_array($name, $skip)) {
+            if($io->isDot() || in_array($name, $skip)) {
                 continue;
             }
 
-            if ($io->isDir()) {
+            if($io->isDir()) {
                 $langs->push(['code' => $name, 'name' => locale_get_display_name($name)]);
             }
         }
@@ -149,26 +158,25 @@ trait AdminDirectoryController
         $res['primary_locale'] = config('app.locale');
 
         $submissionState = Http::withoutVerifying()
-            ->post('https://pixelfed.org/api/v1/directory/check-submission', [
-                'domain' => config('pixelfed.domain.app'),
-            ]);
+        ->post('https://pixelfed.org/api/v1/directory/check-submission', [
+            'domain' => config('pixelfed.domain.app')
+        ]);
 
         $res['submission_state'] = $submissionState->json();
-
         return $res;
     }
 
     protected function validVal($res, $val, $count = false, $minLen = false)
     {
-        if (! isset($res[$val])) {
+        if(!isset($res[$val])) {
             return false;
         }
 
-        if ($count) {
+        if($count) {
             return count($res[$val]) >= $count;
         }
 
-        if ($minLen) {
+        if($minLen) {
             return strlen($res[$val]) >= $minLen;
         }
 
@@ -185,11 +193,11 @@ trait AdminDirectoryController
             'favourite_posts' => 'array|max:12',
             'favourite_posts.*' => 'distinct',
             'privacy_pledge' => 'sometimes',
-            'banner_image' => 'sometimes|mimes:jpg,png|dimensions:width=1920,height:1080|max:5000',
+            'banner_image' => 'sometimes|mimes:jpg,png|dimensions:width=1920,height:1080|max:5000'
         ]);
 
         $config = ConfigCache::firstOrNew([
-            'k' => 'pixelfed.directory',
+            'k' => 'pixelfed.directory'
         ]);
 
         $res = $config->v ? json_decode($config->v, true) : [];
@@ -199,28 +207,27 @@ trait AdminDirectoryController
         $res['contact_email'] = $request->input('contact_email');
         $res['privacy_pledge'] = (bool) $request->input('privacy_pledge');
 
-        if ($request->filled('location')) {
+        if($request->filled('location')) {
             $exists = (new ISO3166)->name($request->location);
-            if ($exists) {
+            if($exists) {
                 $res['location'] = $request->input('location');
             }
         }
 
-        if ($request->hasFile('banner_image')) {
+        if($request->hasFile('banner_image')) {
             collect(Storage::files('public/headers'))
-                ->filter(function ($name) {
-                    $protected = [
-                        'public/headers/.gitignore',
-                        'public/headers/default.jpg',
-                        'public/headers/missing.png',
-                    ];
-
-                    return ! in_array($name, $protected);
-                })
-                ->each(function ($name) {
-                    Storage::delete($name);
-                });
-            $path = $request->file('banner_image')->storePublicly('public/headers');
+            ->filter(function($name) {
+                $protected = [
+                    'public/headers/.gitignore',
+                    'public/headers/default.jpg',
+                    'public/headers/missing.png'
+                ];
+                return !in_array($name, $protected);
+            })
+            ->each(function($name) {
+                Storage::delete($name);
+            });
+            $path = $request->file('banner_image')->store('public/headers');
             $res['banner_image'] = $path;
             ConfigCacheService::put('app.banner_image', url(Storage::url($path)));
 
@@ -232,10 +239,9 @@ trait AdminDirectoryController
 
         ConfigCacheService::put('pixelfed.directory', $config->v);
         $updated = json_decode($config->v, true);
-        if (isset($updated['banner_image'])) {
+        if(isset($updated['banner_image'])) {
             $updated['banner_image'] = url(Storage::url($updated['banner_image']));
         }
-
         return $updated;
     }
 
@@ -243,10 +249,9 @@ trait AdminDirectoryController
     {
         $reqs = [];
         $reqs['feature_config'] = [
-            'open_registration' => (bool) config_cache('pixelfed.open_registration'),
-            'curated_onboarding' => (bool) config_cache('instance.curated_registration.enabled'),
+            'open_registration' => config_cache('pixelfed.open_registration'),
             'activitypub_enabled' => config_cache('federation.activitypub.enabled'),
-            'oauth_enabled' => (bool) config_cache('pixelfed.oauth_enabled'),
+            'oauth_enabled' => config_cache('pixelfed.oauth_enabled'),
             'media_types' => Str::of(config_cache('pixelfed.media_types'))->explode(','),
             'image_quality' => config_cache('pixelfed.image_quality'),
             'optimize_image' => config_cache('pixelfed.optimize_image'),
@@ -260,14 +265,13 @@ trait AdminDirectoryController
         ];
 
         $validator = Validator::make($reqs['feature_config'], [
-            'open_registration' => 'required_unless:curated_onboarding,true',
-            'curated_onboarding' => 'required_unless:open_registration,true',
+            'open_registration' => 'required|accepted',
             'activitypub_enabled' => 'required|accepted',
             'oauth_enabled' => 'required|accepted',
             'media_types' => [
                 'required',
-                function ($attribute, $value, $fail) {
-                    if (! in_array('image/jpeg', $value->toArray()) || ! in_array('image/png', $value->toArray())) {
+                 function ($attribute, $value, $fail) {
+                    if (!in_array('image/jpeg', $value->toArray()) || !in_array('image/png', $value->toArray())) {
                         $fail('You must enable image/jpeg and image/png support.');
                     }
                 },
@@ -278,10 +282,10 @@ trait AdminDirectoryController
             'max_account_size' => 'required_if:enforce_account_limit,true|integer|min:1000000',
             'max_album_length' => 'required|integer|min:4|max:20',
             'account_deletion' => 'required|accepted',
-            'max_caption_length' => 'required|integer|min:500|max:10000',
+            'max_caption_length' => 'required|integer|min:500|max:10000'
         ]);
 
-        if (! $validator->validate()) {
+        if(!$validator->validate()) {
             return response()->json($validator->errors(), 422);
         }
 
@@ -290,7 +294,6 @@ trait AdminDirectoryController
 
         $data = (new PixelfedDirectoryController())->buildListing();
         $res = Http::withoutVerifying()->post('https://pixelfed.org/api/v1/directory/submission', $data);
-
         return 200;
     }
 
@@ -298,7 +301,7 @@ trait AdminDirectoryController
     {
         $bannerImage = ConfigCache::whereK('app.banner_image')->first();
         $directory = ConfigCache::whereK('pixelfed.directory')->first();
-        if (! $bannerImage && ! $directory || empty($directory->v)) {
+        if(!$bannerImage && !$directory || empty($directory->v)) {
             return;
         }
         $directoryArr = json_decode($directory->v, true);
@@ -306,12 +309,12 @@ trait AdminDirectoryController
         $protected = [
             'public/headers/.gitignore',
             'public/headers/default.jpg',
-            'public/headers/missing.png',
+            'public/headers/missing.png'
         ];
-        if (! $path || in_array($path, $protected)) {
+        if(!$path || in_array($path, $protected)) {
             return;
         }
-        if (Storage::exists($directoryArr['banner_image'])) {
+        if(Storage::exists($directoryArr['banner_image'])) {
             Storage::delete($directoryArr['banner_image']);
         }
 
@@ -322,13 +325,12 @@ trait AdminDirectoryController
         $bannerImage->save();
         Cache::forget('api:v1:instance-data-response-v1');
         ConfigCacheService::put('pixelfed.directory', $directory);
-
         return $bannerImage->v;
     }
 
     public function directoryGetPopularPosts(Request $request)
     {
-        $ids = Cache::remember('admin:api:popular_posts', 86400, function () {
+        $ids = Cache::remember('admin:api:popular_posts', 86400, function() {
             return Status::whereLocal(true)
                 ->whereScope('public')
                 ->whereType('photo')
@@ -338,21 +340,21 @@ trait AdminDirectoryController
                 ->pluck('id');
         });
 
-        $res = $ids->map(function ($id) {
+        $res = $ids->map(function($id) {
             return StatusService::get($id);
         })
-            ->filter(function ($post) {
-                return $post && isset($post['account']);
-            })
-            ->values();
+        ->filter(function($post) {
+            return $post && isset($post['account']);
+        })
+        ->values();
 
-        return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
     }
 
     public function directoryGetAddPostByIdSearch(Request $request)
     {
         $this->validate($request, [
-            'q' => 'required|integer',
+            'q' => 'required|integer'
         ]);
 
         $id = $request->input('q');
@@ -375,12 +377,11 @@ trait AdminDirectoryController
         $profile_id = $request->input('profile_id');
         $testimonials = ConfigCache::whereK('pixelfed.directory.testimonials')->firstOrFail();
         $existing = collect(json_decode($testimonials->v, true))
-            ->filter(function ($t) use ($profile_id) {
+            ->filter(function($t) use($profile_id) {
                 return $t['profile_id'] !== $profile_id;
             })
             ->values();
         ConfigCacheService::put('pixelfed.directory.testimonials', $existing);
-
         return $existing;
     }
 
@@ -388,13 +389,13 @@ trait AdminDirectoryController
     {
         $this->validate($request, [
             'username' => 'required',
-            'body' => 'required|string|min:5|max:500',
+            'body' => 'required|string|min:5|max:500'
         ]);
 
         $user = User::whereUsername($request->input('username'))->whereNull('status')->firstOrFail();
 
         $configCache = ConfigCache::firstOrCreate([
-            'k' => 'pixelfed.directory.testimonials',
+            'k' => 'pixelfed.directory.testimonials'
         ]);
 
         $testimonials = $configCache->v ? collect(json_decode($configCache->v, true)) : collect([]);
@@ -405,7 +406,7 @@ trait AdminDirectoryController
         $testimonials->push([
             'profile_id' => (string) $user->profile_id,
             'username' => $request->input('username'),
-            'body' => $request->input('body'),
+            'body' => $request->input('body')
         ]);
 
         $configCache->v = json_encode($testimonials->toArray());
@@ -413,9 +414,8 @@ trait AdminDirectoryController
         ConfigCacheService::put('pixelfed.directory.testimonials', $configCache->v);
         $res = [
             'profile' => AccountService::get($user->profile_id),
-            'body' => $request->input('body'),
+            'body' => $request->input('body')
         ];
-
         return $res;
     }
 
@@ -423,7 +423,7 @@ trait AdminDirectoryController
     {
         $this->validate($request, [
             'profile_id' => 'required',
-            'body' => 'required|string|min:5|max:500',
+            'body' => 'required|string|min:5|max:500'
         ]);
 
         $profile_id = $request->input('profile_id');
@@ -431,19 +431,18 @@ trait AdminDirectoryController
         $user = User::whereProfileId($profile_id)->firstOrFail();
 
         $configCache = ConfigCache::firstOrCreate([
-            'k' => 'pixelfed.directory.testimonials',
+            'k' => 'pixelfed.directory.testimonials'
         ]);
 
         $testimonials = $configCache->v ? collect(json_decode($configCache->v, true)) : collect([]);
 
-        $updated = $testimonials->map(function ($t) use ($profile_id, $body) {
-            if ($t['profile_id'] == $profile_id) {
+        $updated = $testimonials->map(function($t) use($profile_id, $body) {
+            if($t['profile_id'] == $profile_id) {
                 $t['body'] = $body;
             }
-
             return $t;
         })
-            ->values();
+        ->values();
 
         $configCache->v = json_encode($updated);
         $configCache->save();

app/Http/Controllers/AdminController.php

@@ -424,7 +424,7 @@ class AdminController extends Controller
 
 	public function customEmojiHome(Request $request)
 	{
-		if(!(bool) config_cache('federation.custom_emoji.enabled')) {
+		if(!config('federation.custom_emoji.enabled')) {
 			return view('admin.custom-emoji.not-enabled');
 		}
 		$this->validate($request, [
@@ -497,7 +497,7 @@ class AdminController extends Controller
 
 	public function customEmojiToggleActive(Request $request, $id)
 	{
-		abort_unless((bool) config_cache('federation.custom_emoji.enabled'), 404);
+		abort_unless(config('federation.custom_emoji.enabled'), 404);
 		$emoji = CustomEmoji::findOrFail($id);
 		$emoji->disabled = !$emoji->disabled;
 		$emoji->save();
@@ -508,13 +508,13 @@ class AdminController extends Controller
 
 	public function customEmojiAdd(Request $request)
 	{
-		abort_unless((bool) config_cache('federation.custom_emoji.enabled'), 404);
+		abort_unless(config('federation.custom_emoji.enabled'), 404);
 		return view('admin.custom-emoji.add');
 	}
 
 	public function customEmojiStore(Request $request)
 	{
-		abort_unless((bool) config_cache('federation.custom_emoji.enabled'), 404);
+		abort_unless(config('federation.custom_emoji.enabled'), 404);
 		$this->validate($request, [
 			'shortcode' => [
 				'required',
@@ -545,7 +545,7 @@ class AdminController extends Controller
 
 	public function customEmojiDelete(Request $request, $id)
 	{
-		abort_unless((bool) config_cache('federation.custom_emoji.enabled'), 404);
+		abort_unless(config('federation.custom_emoji.enabled'), 404);
 		$emoji = CustomEmoji::findOrFail($id);
 		Storage::delete("public/{$emoji->media_path}");
 		Cache::forget('pf:custom_emoji');
@@ -555,7 +555,7 @@ class AdminController extends Controller
 
 	public function customEmojiShowDuplicates(Request $request, $id)
 	{
-		abort_unless((bool) config_cache('federation.custom_emoji.enabled'), 404);
+		abort_unless(config('federation.custom_emoji.enabled'), 404);
 		$emoji = CustomEmoji::orderBy('id')->whereDisabled(false)->whereShortcode($id)->firstOrFail();
 		$emojis = CustomEmoji::whereShortcode($id)->where('id', '!=', $emoji->id)->cursorPaginate(10);
 		return view('admin.custom-emoji.duplicates', compact('emoji', 'emojis'));

app/Http/Controllers/AdminCuratedRegisterController.php

@@ -1,335 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Mail\CuratedRegisterAcceptUser;
-use App\Mail\CuratedRegisterRejectUser;
-use App\Mail\CuratedRegisterRequestDetailsFromUser;
-use App\Models\CuratedRegister;
-use App\Models\CuratedRegisterActivity;
-use App\Models\CuratedRegisterTemplate;
-use App\User;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Str;
-
-class AdminCuratedRegisterController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware(['auth', 'admin']);
-    }
-
-    public function index(Request $request)
-    {
-        $this->validate($request, [
-            'filter' => 'sometimes|in:open,all,awaiting,approved,rejected,responses',
-            'sort' => 'sometimes|in:asc,desc',
-        ]);
-        $filter = $request->input('filter', 'open');
-        $sort = $request->input('sort', 'asc');
-        $records = CuratedRegister::when($filter, function ($q, $filter) {
-            if ($filter === 'open') {
-                return $q->where('is_rejected', false)
-                    ->where(function ($query) {
-                        return $query->where('user_has_responded', true)->orWhere('is_awaiting_more_info', false);
-                    })
-                    ->whereNotNull('email_verified_at')
-                    ->whereIsClosed(false);
-            } elseif ($filter === 'all') {
-                return $q;
-            } elseif ($filter === 'responses') {
-                return $q->whereIsClosed(false)
-                    ->whereNotNull('email_verified_at')
-                    ->where('user_has_responded', true)
-                    ->where('is_awaiting_more_info', true);
-            } elseif ($filter === 'awaiting') {
-                return $q->whereIsClosed(false)
-                    ->where('is_rejected', false)
-                    ->where('is_approved', false)
-                    ->where('user_has_responded', false)
-                    ->where('is_awaiting_more_info', true);
-            } elseif ($filter === 'approved') {
-                return $q->whereIsClosed(true)->whereIsApproved(true);
-            } elseif ($filter === 'rejected') {
-                return $q->whereIsClosed(true)->whereIsRejected(true);
-            }
-        })
-            ->when($sort, function ($query, $sort) {
-                return $query->orderBy('id', $sort);
-            })
-            ->paginate(10)
-            ->withQueryString();
-
-        return view('admin.curated-register.index', compact('records', 'filter'));
-    }
-
-    public function show(Request $request, $id)
-    {
-        $record = CuratedRegister::findOrFail($id);
-
-        return view('admin.curated-register.show', compact('record'));
-    }
-
-    public function apiActivityLog(Request $request, $id)
-    {
-        $record = CuratedRegister::findOrFail($id);
-
-        $res = collect([
-            [
-                'id' => 1,
-                'action' => 'created',
-                'title' => 'Onboarding application created',
-                'message' => null,
-                'link' => null,
-                'timestamp' => $record->created_at,
-            ],
-        ]);
-
-        if ($record->email_verified_at) {
-            $res->push([
-                'id' => 3,
-                'action' => 'email_verified_at',
-                'title' => 'Applicant successfully verified email address',
-                'message' => null,
-                'link' => null,
-                'timestamp' => $record->email_verified_at,
-            ]);
-        }
-
-        $activities = CuratedRegisterActivity::whereRegisterId($record->id)->get();
-
-        $idx = 4;
-        $userResponses = collect([]);
-
-        foreach ($activities as $activity) {
-            $idx++;
-
-            if ($activity->type === 'user_resend_email_confirmation') {
-                continue;
-            }
-            if ($activity->from_user) {
-                $userResponses->push($activity);
-
-                continue;
-            }
-            $res->push([
-                'id' => $idx,
-                'aid' => $activity->id,
-                'action' => $activity->type,
-                'title' => $activity->from_admin ? 'Admin requested info' : 'User responded',
-                'message' => $activity->message,
-                'link' => $activity->adminReviewUrl(),
-                'timestamp' => $activity->created_at,
-            ]);
-        }
-
-        foreach ($userResponses as $ur) {
-            $res = $res->map(function ($r) use ($ur) {
-                if (! isset($r['aid'])) {
-                    return $r;
-                }
-                if ($ur->reply_to_id === $r['aid']) {
-                    $r['user_response'] = $ur;
-
-                    return $r;
-                }
-
-                return $r;
-            });
-        }
-
-        if ($record->is_approved) {
-            $idx++;
-            $res->push([
-                'id' => $idx,
-                'action' => 'approved',
-                'title' => 'Application Approved',
-                'message' => null,
-                'link' => null,
-                'timestamp' => $record->action_taken_at,
-            ]);
-        } elseif ($record->is_rejected) {
-            $idx++;
-            $res->push([
-                'id' => $idx,
-                'action' => 'rejected',
-                'title' => 'Application Rejected',
-                'message' => null,
-                'link' => null,
-                'timestamp' => $record->action_taken_at,
-            ]);
-        }
-
-        return $res->reverse()->values();
-    }
-
-    public function apiMessagePreviewStore(Request $request, $id)
-    {
-        $record = CuratedRegister::findOrFail($id);
-
-        return $request->all();
-    }
-
-    public function apiMessageSendStore(Request $request, $id)
-    {
-        $this->validate($request, [
-            'message' => 'required|string|min:5|max:1000',
-        ]);
-        $record = CuratedRegister::findOrFail($id);
-        abort_if($record->email_verified_at === null, 400, 'Cannot message an unverified email');
-        $activity = new CuratedRegisterActivity;
-        $activity->register_id = $record->id;
-        $activity->admin_id = $request->user()->id;
-        $activity->secret_code = Str::random(32);
-        $activity->type = 'request_details';
-        $activity->from_admin = true;
-        $activity->message = $request->input('message');
-        $activity->save();
-        $record->is_awaiting_more_info = true;
-        $record->user_has_responded = false;
-        $record->save();
-        Mail::to($record->email)->send(new CuratedRegisterRequestDetailsFromUser($record, $activity));
-
-        return $request->all();
-    }
-
-    public function previewDetailsMessageShow(Request $request, $id)
-    {
-        $record = CuratedRegister::findOrFail($id);
-        abort_if($record->email_verified_at === null, 400, 'Cannot message an unverified email');
-        $activity = new CuratedRegisterActivity;
-        $activity->message = $request->input('message');
-
-        return new \App\Mail\CuratedRegisterRequestDetailsFromUser($record, $activity);
-    }
-
-    public function previewMessageShow(Request $request, $id)
-    {
-        $record = CuratedRegister::findOrFail($id);
-        abort_if($record->email_verified_at === null, 400, 'Cannot message an unverified email');
-        $record->message = $request->input('message');
-
-        return new \App\Mail\CuratedRegisterSendMessage($record);
-    }
-
-    public function apiHandleReject(Request $request, $id)
-    {
-        $this->validate($request, [
-            'action' => 'required|in:reject-email,reject-silent',
-        ]);
-        $action = $request->input('action');
-        $record = CuratedRegister::findOrFail($id);
-        abort_if($record->email_verified_at === null, 400, 'Cannot reject an unverified email');
-        $record->is_rejected = true;
-        $record->is_closed = true;
-        $record->action_taken_at = now();
-        $record->save();
-        if ($action === 'reject-email') {
-            Mail::to($record->email)->send(new CuratedRegisterRejectUser($record));
-        }
-
-        return [200];
-    }
-
-    public function apiHandleApprove(Request $request, $id)
-    {
-        $record = CuratedRegister::findOrFail($id);
-        abort_if($record->email_verified_at === null, 400, 'Cannot reject an unverified email');
-        $record->is_approved = true;
-        $record->is_closed = true;
-        $record->action_taken_at = now();
-        $record->save();
-        $user = User::create([
-            'name' => $record->username,
-            'username' => $record->username,
-            'email' => $record->email,
-            'password' => $record->password,
-            'app_register_ip' => $record->ip_address,
-            'email_verified_at' => now(),
-            'register_source' => 'cur_onboarding',
-        ]);
-
-        Mail::to($record->email)->send(new CuratedRegisterAcceptUser($record));
-
-        return [200];
-    }
-
-    public function templates(Request $request)
-    {
-        $templates = CuratedRegisterTemplate::paginate(10);
-
-        return view('admin.curated-register.templates', compact('templates'));
-    }
-
-    public function templateCreate(Request $request)
-    {
-        return view('admin.curated-register.template-create');
-    }
-
-    public function templateEdit(Request $request, $id)
-    {
-        $template = CuratedRegisterTemplate::findOrFail($id);
-
-        return view('admin.curated-register.template-edit', compact('template'));
-    }
-
-    public function templateEditStore(Request $request, $id)
-    {
-        $this->validate($request, [
-            'name' => 'required|string|max:30',
-            'content' => 'required|string|min:5|max:3000',
-            'description' => 'nullable|sometimes|string|max:1000',
-            'active' => 'sometimes',
-        ]);
-        $template = CuratedRegisterTemplate::findOrFail($id);
-        $template->name = $request->input('name');
-        $template->content = $request->input('content');
-        $template->description = $request->input('description');
-        $template->is_active = $request->boolean('active');
-        $template->save();
-
-        return redirect()->back()->with('status', 'Successfully updated template!');
-    }
-
-    public function templateDelete(Request $request, $id)
-    {
-        $template = CuratedRegisterTemplate::findOrFail($id);
-        $template->delete();
-
-        return redirect(route('admin.curated-onboarding.templates'))->with('status', 'Successfully deleted template!');
-    }
-
-    public function templateStore(Request $request)
-    {
-        $this->validate($request, [
-            'name' => 'required|string|max:30',
-            'content' => 'required|string|min:5|max:3000',
-            'description' => 'nullable|sometimes|string|max:1000',
-            'active' => 'sometimes',
-        ]);
-        CuratedRegisterTemplate::create([
-            'name' => $request->input('name'),
-            'content' => $request->input('content'),
-            'description' => $request->input('description'),
-            'is_active' => $request->boolean('active'),
-        ]);
-
-        return redirect(route('admin.curated-onboarding.templates'))->with('status', 'Successfully created new template!');
-    }
-
-    public function getActiveTemplates(Request $request)
-    {
-        $templates = CuratedRegisterTemplate::whereIsActive(true)
-            ->orderBy('order')
-            ->get()
-            ->map(function ($tmp) {
-                return [
-                    'name' => $tmp->name,
-                    'content' => $tmp->content,
-                ];
-            });
-
-        return response()->json($templates);
-    }
-}

app/Http/Controllers/AdminShadowFilterController.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Models\AdminShadowFilter;
-use App\Profile;
-use App\Services\AccountService;
-use App\Services\AdminShadowFilterService;
-
-class AdminShadowFilterController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware(['auth','admin']);
-    }
-
-    public function home(Request $request)
-    {
-        $filter = $request->input('filter');
-        $searchQuery = $request->input('q');
-        $filters = AdminShadowFilter::whereHas('profile')
-        ->when($filter, function($q, $filter) {
-            if($filter == 'all') {
-                return $q;
-            } else if($filter == 'inactive') {
-                return $q->whereActive(false);
-            } else {
-                return $q;
-            }
-        }, function($q, $filter) {
-            return $q->whereActive(true);
-        })
-        ->when($searchQuery, function($q, $searchQuery) {
-            $ids = Profile::where('username', 'like', '%' . $searchQuery . '%')
-                ->limit(100)
-                ->pluck('id')
-                ->toArray();
-            return $q->where('item_type', 'App\Profile')->whereIn('item_id', $ids);
-        })
-        ->latest()
-        ->paginate(10)
-        ->withQueryString();
-
-        return view('admin.asf.home', compact('filters'));
-    }
-
-    public function create(Request $request)
-    {
-        return view('admin.asf.create');
-    }
-
-    public function edit(Request $request, $id)
-    {
-        $filter = AdminShadowFilter::findOrFail($id);
-        $profile = AccountService::get($filter->item_id);
-        return view('admin.asf.edit', compact('filter', 'profile'));
-    }
-
-    public function store(Request $request)
-    {
-        $this->validate($request, [
-            'username' => 'required',
-            'active' => 'sometimes',
-            'note' => 'sometimes',
-            'hide_from_public_feeds' => 'sometimes'
-        ]);
-
-        $profile = Profile::whereUsername($request->input('username'))->first();
-
-        if(!$profile) {
-            return back()->withErrors(['Invalid account']);
-        }
-
-        if($profile->user && $profile->user->is_admin) {
-            return back()->withErrors(['Cannot filter an admin account']);
-        }
-
-        $active = $request->has('active') && $request->has('hide_from_public_feeds');
-
-        AdminShadowFilter::updateOrCreate([
-            'item_id' => $profile->id,
-            'item_type' => get_class($profile)
-        ], [
-            'is_local' => $profile->domain === null,
-            'note' => $request->input('note'),
-            'hide_from_public_feeds' => $request->has('hide_from_public_feeds'),
-            'admin_id' => $request->user()->profile_id,
-            'active' => $active
-        ]);
-
-        AdminShadowFilterService::refresh();
-
-        return redirect('/i/admin/asf/home');
-    }
-
-    public function storeEdit(Request $request, $id)
-    {
-        $this->validate($request, [
-            'active' => 'sometimes',
-            'note' => 'sometimes',
-            'hide_from_public_feeds' => 'sometimes'
-        ]);
-
-        $filter = AdminShadowFilter::findOrFail($id);
-
-        $profile = Profile::findOrFail($filter->item_id);
-
-        if($profile->user && $profile->user->is_admin) {
-            return back()->withErrors(['Cannot filter an admin account']);
-        }
-
-        $active = $request->has('active');
-        $filter->active = $active;
-        $filter->hide_from_public_feeds = $request->has('hide_from_public_feeds');
-        $filter->note = $request->input('note');
-        $filter->save();
-
-        AdminShadowFilterService::refresh();
-
-        return redirect('/i/admin/asf/home');
-    }
-}

app/Http/Controllers/Api/AdminApiController.php

@@ -40,20 +40,16 @@ class AdminApiController extends Controller
 {
     public function supported(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
 
         return response()->json(['supported' => true]);
     }
 
     public function getStats(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
 
         $res = AdminStatsService::summary();
         $res['autospam_count'] = AccountInterstitial::whereType('post.autospam')
@@ -64,10 +60,8 @@ class AdminApiController extends Controller
 
     public function autospam(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
 
         $appeals = AccountInterstitial::whereType('post.autospam')
             ->whereNull('appeal_handled_at')
@@ -101,10 +95,8 @@ class AdminApiController extends Controller
 
     public function autospamHandle(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'action' => 'required|in:dismiss,approve,dismiss-all,approve-all,delete-post,delete-account',
@@ -247,10 +239,8 @@ class AdminApiController extends Controller
 
     public function modReports(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
 
         $reports = Report::whereNull('admin_seen')
             ->orderBy('created_at','desc')
@@ -295,10 +285,8 @@ class AdminApiController extends Controller
 
     public function modReportHandle(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'action'    => 'required|string',
@@ -355,11 +343,8 @@ class AdminApiController extends Controller
 
     public function getConfiguration(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
-
         abort_unless(config('instance.enable_cc'), 400);
 
         return collect([
@@ -401,11 +386,8 @@ class AdminApiController extends Controller
 
     public function updateConfiguration(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:write'), 404);
-
         abort_unless(config('instance.enable_cc'), 400);
 
         $this->validate($request, [
@@ -466,11 +448,8 @@ class AdminApiController extends Controller
 
     public function getUsers(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
-
         $this->validate($request, [
             'sort' => 'sometimes|in:asc,desc',
         ]);
@@ -487,10 +466,8 @@ class AdminApiController extends Controller
 
     public function getUser(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
 
         $id = $request->input('user_id');
         $key = 'pf-admin-api:getUser:byId:' . $id;
@@ -520,10 +497,8 @@ class AdminApiController extends Controller
 
     public function userAdminAction(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'id' => 'required',
@@ -694,10 +669,8 @@ class AdminApiController extends Controller
 
     public function instances(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'q' => 'sometimes',
@@ -734,10 +707,8 @@ class AdminApiController extends Controller
 
     public function getInstance(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
 
         $id = $request->input('id');
         $res = Instance::findOrFail($id);
@@ -747,10 +718,8 @@ class AdminApiController extends Controller
 
     public function moderateInstance(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'id' => 'required',
@@ -773,10 +742,8 @@ class AdminApiController extends Controller
 
     public function refreshInstanceStats(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin == 1, 404);
-        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'id' => 'required',
@@ -793,10 +760,8 @@ class AdminApiController extends Controller
 
     public function getAllStats(Request $request)
     {
-        abort_if(!$request->user() || !$request->user()->token(), 404);
-
+        abort_if(!$request->user(), 404);
         abort_unless($request->user()->is_admin === 1, 404);
-        abort_unless($request->user()->tokenCan('admin:read'), 404);
 
         if($request->has('refresh')) {
             Cache::forget('admin-api:instance-all-stats-v1');

app/Http/Controllers/Api/ApiV1Dot1Controller.php

@@ -11,20 +11,15 @@ use League\Fractal\Serializer\ArraySerializer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use App\AccountLog;
 use App\EmailVerification;
-use App\Follower;
 use App\Place;
 use App\Status;
 use App\Report;
 use App\Profile;
 use App\StatusArchived;
 use App\User;
-use App\UserSetting;
 use App\Services\AccountService;
-use App\Services\FollowerService;
 use App\Services\StatusService;
 use App\Services\ProfileStatusService;
-use App\Services\LikeService;
-use App\Services\ReblogService;
 use App\Services\PublicTimelineService;
 use App\Services\NetworkTimelineService;
 use App\Util\Lexer\RestrictedNames;
@@ -38,7 +33,6 @@ use App\Mail\PasswordChange;
 use App\Mail\ConfirmAppEmail;
 use App\Http\Resources\StatusStateless;
 use App\Jobs\StatusPipeline\StatusDelete;
-use App\Jobs\StatusPipeline\RemoteStatusDelete;
 use App\Jobs\ReportPipeline\ReportNotifyAdminViaEmail;
 use Illuminate\Support\Facades\RateLimiter;
 
@@ -68,10 +62,9 @@ class ApiV1Dot1Controller extends Controller
 
 	public function report(Request $request)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('write'), 403);
-
 		$user = $request->user();
+
+		abort_if(!$user, 403);
 		abort_if($user->status != null, 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
@@ -176,10 +169,9 @@ class ApiV1Dot1Controller extends Controller
 	 */
 	public function deleteAvatar(Request $request)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('write'), 403);
-
 		$user = $request->user();
+
+		abort_if(!$user, 403);
 		abort_if($user->status != null, 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
@@ -217,10 +209,9 @@ class ApiV1Dot1Controller extends Controller
 	 */
 	public function accountPosts(Request $request, $id)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('read'), 403);
-
 		$user = $request->user();
+
+		abort_if(!$user, 403);
 		abort_if($user->status != null, 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
@@ -258,10 +249,8 @@ class ApiV1Dot1Controller extends Controller
 	 */
 	public function accountChangePassword(Request $request)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('write'), 403);
-
 		$user = $request->user();
+		abort_if(!$user, 403);
 		abort_if($user->status != null, 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -301,10 +290,8 @@ class ApiV1Dot1Controller extends Controller
 	 */
 	public function accountLoginActivity(Request $request)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('read'), 403);
-
 		$user = $request->user();
+		abort_if(!$user, 403);
 		abort_if($user->status != null, 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -343,10 +330,8 @@ class ApiV1Dot1Controller extends Controller
 	 */
 	public function accountTwoFactor(Request $request)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('read'), 403);
-
 		$user = $request->user();
+		abort_if(!$user, 403);
 		abort_if($user->status != null, 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
@@ -367,10 +352,8 @@ class ApiV1Dot1Controller extends Controller
 	 */
 	public function accountEmailsFromPixelfed(Request $request)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('read'), 403);
-
 		$user = $request->user();
+		abort_if(!$user, 403);
 		abort_if($user->status != null, 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -444,10 +427,8 @@ class ApiV1Dot1Controller extends Controller
 	 */
 	public function accountApps(Request $request)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('read'), 403);
-
 		$user = $request->user();
+		abort_if(!$user, 403);
 		abort_if($user->status != null, 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
@@ -473,21 +454,21 @@ class ApiV1Dot1Controller extends Controller
 	{
 		return [
 			'open' => (bool) config_cache('pixelfed.open_registration'),
-			'iara' => (bool) config_cache('pixelfed.allow_app_registration'),
+			'iara' => config('pixelfed.allow_app_registration')
 		];
 	}
 
 	public function inAppRegistration(Request $request)
 	{
 		abort_if($request->user(), 404);
-		abort_unless((bool) config_cache('pixelfed.open_registration'), 404);
-		abort_unless((bool) config_cache('pixelfed.allow_app_registration'), 404);
+		abort_unless(config_cache('pixelfed.open_registration'), 404);
+		abort_unless(config('pixelfed.allow_app_registration'), 404);
 		abort_unless($request->hasHeader('X-PIXELFED-APP'), 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
 		}
 
-		$rl = RateLimiter::attempt('pf:apiv1.1:iar:'.$request->ip(), config('pixelfed.app_registration_rate_limit_attempts', 3), function(){}, config('pixelfed.app_registration_rate_limit_decay', 1800));
+		$rl = RateLimiter::attempt('pf:apiv1.1:iar:'.$request->ip(), 3, function(){}, 1800);
 		abort_if(!$rl, 400, 'Too many requests');
 
 		$this->validate($request, [
@@ -560,10 +541,10 @@ class ApiV1Dot1Controller extends Controller
 		$user->password = Hash::make($password);
 		$user->register_source = 'app';
 		$user->app_register_ip = $request->ip();
-		$user->app_register_token = Str::random(40);
+		$user->app_register_token = Str::random(32);
 		$user->save();
 
-		$rtoken = Str::random(64);
+		$rtoken = Str::random(mt_rand(64, 70));
 
 		$verify = new EmailVerification();
 		$verify->user_id = $user->id;
@@ -572,12 +553,7 @@ class ApiV1Dot1Controller extends Controller
 		$verify->random_token = $rtoken;
 		$verify->save();
 
-		$params = http_build_query([
-			'ut' => $user->app_register_token,
-			'rt' => $rtoken,
-			'ea' => base64_encode($user->email)
-		]);
-		$appUrl = url('/api/v1.1/auth/iarer?'. $params);
+		$appUrl = url('/api/v1.1/auth/iarer?ut=' . $user->app_register_token . '&rt=' . $rtoken);
 
 		Mail::to($user->email)->send(new ConfirmAppEmail($verify, $appUrl));
 
@@ -590,34 +566,29 @@ class ApiV1Dot1Controller extends Controller
 	{
 		$this->validate($request, [
 			'ut' => 'required',
-			'rt' => 'required',
-			'ea' => 'required'
+			'rt' => 'required'
 		]);
+		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+			abort_if(BouncerService::checkIp($request->ip()), 404);
+		}
 		$ut = $request->input('ut');
 		$rt = $request->input('rt');
-		$ea = $request->input('ea');
-		$params = http_build_query([
-			'ut' => $ut,
-			'rt' => $rt,
-			'domain' => config('pixelfed.domain.app'),
-			'ea' => $ea
-		]);
-		$url = 'pixelfed://confirm-account/'. $ut . '?' . $params;
+		$url = 'pixelfed://confirm-account/'. $ut . '?rt=' . $rt;
 		return redirect()->away($url);
 	}
 
 	public function inAppRegistrationConfirm(Request $request)
 	{
 		abort_if($request->user(), 404);
-		abort_unless((bool) config_cache('pixelfed.open_registration'), 404);
-		abort_unless((bool) config_cache('pixelfed.allow_app_registration'), 404);
+		abort_unless(config_cache('pixelfed.open_registration'), 404);
+		abort_unless(config('pixelfed.allow_app_registration'), 404);
 		abort_unless($request->hasHeader('X-PIXELFED-APP'), 403);
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
 		}
 
-		$rl = RateLimiter::attempt('pf:apiv1.1:iarc:'.$request->ip(), config('pixelfed.app_registration_confirm_rate_limit_attempts', 20), function(){}, config('pixelfed.app_registration_confirm_rate_limit_decay', 1800));
-		abort_if(!$rl, 429, 'Too many requests');
+		$rl = RateLimiter::attempt('pf:apiv1.1:iarc:'.$request->ip(), 10, function(){}, 1800);
+		abort_if(!$rl, 400, 'Too many requests');
 
 		$this->validate($request, [
 			'user_token' => 'required',
@@ -653,8 +624,7 @@ class ApiV1Dot1Controller extends Controller
 
 	public function archive(Request $request, $id)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('write'), 403);
+		abort_if(!$request->user(), 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -686,8 +656,7 @@ class ApiV1Dot1Controller extends Controller
 
 	public function unarchive(Request $request, $id)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('write'), 403);
+		abort_if(!$request->user(), 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -718,8 +687,7 @@ class ApiV1Dot1Controller extends Controller
 
 	public function archivedPosts(Request $request)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('read'), 403);
+		abort_if(!$request->user(), 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -735,8 +703,7 @@ class ApiV1Dot1Controller extends Controller
 
 	public function placesById(Request $request, $id, $slug)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('read'), 403);
+		abort_if(!$request->user(), 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -774,9 +741,8 @@ class ApiV1Dot1Controller extends Controller
 
 	public function moderatePost(Request $request, $id)
 	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
+		abort_if(!$request->user(), 403);
 		abort_if($request->user()->is_admin != true, 403);
-		abort_unless($request->user()->tokenCan('admin:write'), 403);
 
 		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 			abort_if(BouncerService::checkIp($request->ip()), 404);
@@ -871,7 +837,7 @@ class ApiV1Dot1Controller extends Controller
 			Cache::forget('profile:embed:' . $status->profile_id);
 			StatusService::del($status->id, true);
 			Cache::forget('profile:status_count:'.$status->profile_id);
-			$status->uri ? RemoteStatusDelete::dispatch($status) : StatusDelete::dispatch($status);
+			StatusDelete::dispatch($status);
 			return [];
 		}
 
@@ -879,62 +845,4 @@ class ApiV1Dot1Controller extends Controller
 
 		return StatusService::get($status->id, false);
 	}
-
-	public function getWebSettings(Request $request)
-	{
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('read'), 403);
-
-        $uid = $request->user()->id;
-        $settings = UserSetting::firstOrCreate([
-            'user_id' => $uid
-        ]);
-        if(!$settings->other) {
-            return [];
-        }
-		return $settings->other;
-	}
-
-    public function setWebSettings(Request $request)
-    {
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('write'), 403);
-
-        $this->validate($request, [
-            'field' => 'required|in:enable_reblogs,hide_reblog_banner',
-            'value' => 'required'
-        ]);
-        $field = $request->input('field');
-        $value = $request->input('value');
-        $settings = UserSetting::firstOrCreate([
-            'user_id' => $request->user()->id
-        ]);
-        if(!$settings->other) {
-            $other = [];
-        } else {
-            $other = $settings->other;
-        }
-        $other[$field] = $value;
-        $settings->other = $other;
-        $settings->save();
-
-        return [200];
-    }
-
-    public function getMutualAccounts(Request $request, $id)
-    {
-		abort_if(!$request->user() || !$request->user()->token(), 403);
-		abort_unless($request->user()->tokenCan('follows'), 403);
-
-        $account = AccountService::get($id, true);
-        if(!$account || !isset($account['id'])) { return []; }
-        $res = collect(FollowerService::mutualAccounts($request->user()->profile_id, $id))
-            ->map(function($accountId) {
-                return AccountService::get($accountId, true);
-            })
-            ->filter()
-            ->take(24)
-            ->values();
-        return $this->json($res);
-    }
 }

app/Http/Controllers/Api/ApiV2Controller.php

@@ -17,323 +17,308 @@ use App\Services\SearchApiV2Service;
 use App\Util\Media\Filter;
 use App\Jobs\MediaPipeline\MediaDeletePipeline;
 use App\Jobs\VideoPipeline\{
-    VideoOptimize,
-    VideoPostProcess,
-    VideoThumbnail
+	VideoOptimize,
+	VideoPostProcess,
+	VideoThumbnail
 };
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use App\Transformer\Api\Mastodon\v1\{
-    AccountTransformer,
-    MediaTransformer,
-    NotificationTransformer,
-    StatusTransformer,
+	AccountTransformer,
+	MediaTransformer,
+	NotificationTransformer,
+	StatusTransformer,
 };
 use App\Transformer\Api\{
-    RelationshipTransformer,
+	RelationshipTransformer,
 };
-use App\Util\Site\Nodeinfo;
-use App\Services\UserRoleService;
 
 class ApiV2Controller extends Controller
 {
-    const PF_API_ENTITY_KEY = "_pe";
+	const PF_API_ENTITY_KEY = "_pe";
 
-    public function json($res, $code = 200, $headers = [])
-    {
-        return response()->json($res, $code, $headers, JSON_UNESCAPED_SLASHES);
-    }
+	public function json($res, $code = 200, $headers = [])
+	{
+		return response()->json($res, $code, $headers, JSON_UNESCAPED_SLASHES);
+	}
 
     public function instance(Request $request)
     {
-        $contact = Cache::remember('api:v1:instance-data:contact', 604800, function () {
-            if(config_cache('instance.admin.pid')) {
-                return AccountService::getMastodon(config_cache('instance.admin.pid'), true);
-            }
-            $admin = User::whereIsAdmin(true)->first();
-            return $admin && isset($admin->profile_id) ?
-                AccountService::getMastodon($admin->profile_id, true) :
-                null;
-        });
+		$contact = Cache::remember('api:v1:instance-data:contact', 604800, function () {
+			if(config_cache('instance.admin.pid')) {
+				return AccountService::getMastodon(config_cache('instance.admin.pid'), true);
+			}
+			$admin = User::whereIsAdmin(true)->first();
+			return $admin && isset($admin->profile_id) ?
+				AccountService::getMastodon($admin->profile_id, true) :
+				null;
+		});
 
-        $rules = Cache::remember('api:v1:instance-data:rules', 604800, function () {
-            return config_cache('app.rules') ?
-                collect(json_decode(config_cache('app.rules'), true))
-                ->map(function($rule, $key) {
-                    $id = $key + 1;
-                    return [
-                        'id' => "{$id}",
-                        'text' => $rule
-                    ];
-                })
-                ->toArray() : [];
-        });
+		$rules = Cache::remember('api:v1:instance-data:rules', 604800, function () {
+			return config_cache('app.rules') ?
+				collect(json_decode(config_cache('app.rules'), true))
+				->map(function($rule, $key) {
+					$id = $key + 1;
+					return [
+						'id' => "{$id}",
+						'text' => $rule
+					];
+				})
+				->toArray() : [];
+		});
 
-        $res = Cache::remember('api:v2:instance-data-response-v2', 1800, function () use($contact, $rules) {
-            return [
-                'domain' => config('pixelfed.domain.app'),
-                'title' => config_cache('app.name'),
-                'version' => '3.5.3 (compatible; Pixelfed ' . config('pixelfed.version') .')',
-                'source_url' => 'https://github.com/pixelfed/pixelfed',
-                'description' => config_cache('app.short_description'),
-                'usage' => [
-                    'users' => [
-                        'active_month' => (int) Nodeinfo::activeUsersMonthly()
-                    ]
-                ],
-                'thumbnail' => [
-                    'url' => config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg')),
-                    'blurhash' => InstanceService::headerBlurhash(),
-                    'versions' => [
-                        '@1x' => config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg')),
-                        '@2x' => config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg'))
-                    ]
-                ],
-                'languages' => [config('app.locale')],
-                'configuration' => [
-                    'urls' => [
-                        'streaming' => null,
-                        'status' => null
-                    ],
-                    'vapid' => [
-                        'public_key' => config('webpush.vapid.public_key'),
-                    ],
-                    'accounts' => [
-                        'max_featured_tags' => 0,
-                    ],
-                    'statuses' => [
-                        'max_characters' => (int) config_cache('pixelfed.max_caption_length'),
-                        'max_media_attachments' => (int) config_cache('pixelfed.max_album_length'),
-                        'characters_reserved_per_url' => 23
-                    ],
-                    'media_attachments' => [
-                        'supported_mime_types' => explode(',', config_cache('pixelfed.media_types')),
-                        'image_size_limit' => config_cache('pixelfed.max_photo_size') * 1024,
-                        'image_matrix_limit' => 3686400,
-                        'video_size_limit' => config_cache('pixelfed.max_photo_size') * 1024,
-                        'video_frame_rate_limit' => 240,
-                        'video_matrix_limit' => 3686400
-                    ],
-                    'polls' => [
-                        'max_options' => 0,
-                        'max_characters_per_option' => 0,
-                        'min_expiration' => 0,
-                        'max_expiration' => 0,
-                    ],
-                    'translation' => [
-                        'enabled' => false,
-                    ],
-                ],
-                'registrations' => [
-                    'enabled' => null,
-                    'approval_required' => false,
-                    'message' => null,
-                    'url' => null,
-                ],
-                'contact' => [
-                    'email' => config('instance.email'),
-                    'account' => $contact
-                ],
-                'rules' => $rules
-            ];
-        });
+		$res = [
+			'domain' => config('pixelfed.domain.app'),
+			'title' => config_cache('app.name'),
+			'version' => config('pixelfed.version'),
+			'source_url' => 'https://github.com/pixelfed/pixelfed',
+			'description' => config_cache('app.short_description'),
+			'usage' => [
+				'users' => [
+					'active_month' => (int) Cache::remember('api:nodeinfo:am', 172800, function() {
+						return User::select('last_active_at', 'created_at')
+							->where('last_active_at', '>', now()->subMonths(1))
+							->orWhere('created_at', '>', now()->subMonths(1))
+							->count();
+					})
+				]
+			],
+			'thumbnail' => [
+				'url' => config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg')),
+				'blurhash' => InstanceService::headerBlurhash(),
+				'versions' => [
+					'@1x' => config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg')),
+					'@2x' => config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg'))
+				]
+			],
+			'languages' => [config('app.locale')],
+			'configuration' => [
+				'urls' => [
+					'streaming' => 'wss://' . config('pixelfed.domain.app'),
+					'status' => null
+				],
+				'accounts' => [
+					'max_featured_tags' => 0,
+				],
+				'statuses' => [
+					'max_characters' => (int) config('pixelfed.max_caption_length'),
+					'max_media_attachments' => (int) config_cache('pixelfed.max_album_length'),
+					'characters_reserved_per_url' => 23
+				],
+				'media_attachments' => [
+					'supported_mime_types' => explode(',', config_cache('pixelfed.media_types')),
+					'image_size_limit' => config_cache('pixelfed.max_photo_size') * 1024,
+					'image_matrix_limit' => 3686400,
+					'video_size_limit' => config_cache('pixelfed.max_photo_size') * 1024,
+					'video_frame_rate_limit' => 240,
+					'video_matrix_limit' => 3686400
+				],
+				'polls' => [
+					'max_options' => 4,
+					'max_characters_per_option' => 50,
+					'min_expiration' => 300,
+					'max_expiration' => 2629746,
+				],
+				'translation' => [
+					'enabled' => false,
+				],
+			],
+			'registrations' => [
+				'enabled' => (bool) config_cache('pixelfed.open_registration'),
+				'approval_required' => false,
+				'message' => null
+			],
+			'contact' => [
+				'email' => config('instance.email'),
+				'account' => $contact
+			],
+			'rules' => $rules
+		];
 
-        $res['registrations']['enabled'] = (bool) config_cache('pixelfed.open_registration');
-        $res['registrations']['approval_required'] = (bool) config_cache('instance.curated_registration.enabled');
-        return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
+    	return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
     }
 
-    /**
-     * GET /api/v2/search
-     *
-     *
-     * @return array
-     */
-    public function search(Request $request)
-    {
-        abort_if(!$request->user() || !$request->user()->token(), 403);
-        abort_unless($request->user()->tokenCan('read'), 403);
+	/**
+	 * GET /api/v2/search
+	 *
+	 *
+	 * @return array
+	 */
+	public function search(Request $request)
+	{
+		abort_if(!$request->user(), 403);
 
-        $this->validate($request, [
-            'q' => 'required|string|min:1|max:100',
-            'account_id' => 'nullable|string',
-            'max_id' => 'nullable|string',
-            'min_id' => 'nullable|string',
-            'type' => 'nullable|in:accounts,hashtags,statuses',
-            'exclude_unreviewed' => 'nullable',
-            'resolve' => 'nullable',
-            'limit' => 'nullable|integer|max:40',
-            'offset' => 'nullable|integer',
-            'following' => 'nullable'
-        ]);
+		$this->validate($request, [
+			'q' => 'required|string|min:1|max:100',
+			'account_id' => 'nullable|string',
+			'max_id' => 'nullable|string',
+			'min_id' => 'nullable|string',
+			'type' => 'nullable|in:accounts,hashtags,statuses',
+			'exclude_unreviewed' => 'nullable',
+			'resolve' => 'nullable',
+			'limit' => 'nullable|integer|max:40',
+			'offset' => 'nullable|integer',
+			'following' => 'nullable'
+		]);
 
-        if($request->user()->has_roles && !UserRoleService::can('can-view-discover', $request->user()->id)) {
-            return [
-                'accounts' => [],
-                'hashtags' => [],
-                'statuses' => []
-            ];
-        }
+		$mastodonMode = !$request->has('_pe');
+		return $this->json(SearchApiV2Service::query($request, $mastodonMode));
+	}
 
-        $mastodonMode = !$request->has('_pe');
-        return $this->json(SearchApiV2Service::query($request, $mastodonMode));
-    }
+	/**
+	 * GET /api/v2/streaming/config
+	 *
+	 *
+	 * @return object
+	 */
+	public function getWebsocketConfig()
+	{
+		return config('broadcasting.default') === 'pusher' ? [
+			'host' => config('broadcasting.connections.pusher.options.host'),
+			'port' => config('broadcasting.connections.pusher.options.port'),
+			'key' => config('broadcasting.connections.pusher.key'),
+			'cluster' => config('broadcasting.connections.pusher.options.cluster')
+		] : [];
+	}
 
-    /**
-     * GET /api/v2/streaming/config
-     *
-     *
-     * @return object
-     */
-    public function getWebsocketConfig()
-    {
-        return config('broadcasting.default') === 'pusher' ? [
-            'host' => config('broadcasting.connections.pusher.options.host'),
-            'port' => config('broadcasting.connections.pusher.options.port'),
-            'key' => config('broadcasting.connections.pusher.key'),
-            'cluster' => config('broadcasting.connections.pusher.options.cluster')
-        ] : [];
-    }
+	/**
+	 * POST /api/v2/media
+	 *
+	 *
+	 * @return MediaTransformer
+	 */
+	public function mediaUploadV2(Request $request)
+	{
+		abort_if(!$request->user(), 403);
 
-    /**
-     * POST /api/v2/media
-     *
-     *
-     * @return MediaTransformer
-     */
-    public function mediaUploadV2(Request $request)
-    {
-        abort_if(!$request->user() || !$request->user()->token(), 403);
-        abort_unless($request->user()->tokenCan('write'), 403);
+		$this->validate($request, [
+		  	'file.*' => [
+				'required_without:file',
+				'mimetypes:' . config_cache('pixelfed.media_types'),
+				'max:' . config_cache('pixelfed.max_photo_size'),
+			],
+			'file' => [
+				'required_without:file.*',
+				'mimetypes:' . config_cache('pixelfed.media_types'),
+				'max:' . config_cache('pixelfed.max_photo_size'),
+			],
+		  'filter_name' => 'nullable|string|max:24',
+		  'filter_class' => 'nullable|alpha_dash|max:24',
+		  'description' => 'nullable|string|max:' . config_cache('pixelfed.max_altext_length'),
+		  'replace_id' => 'sometimes'
+		]);
 
-        $this->validate($request, [
-            'file.*' => [
-                'required_without:file',
-                'mimetypes:' . config_cache('pixelfed.media_types'),
-                'max:' . config_cache('pixelfed.max_photo_size'),
-            ],
-            'file' => [
-                'required_without:file.*',
-                'mimetypes:' . config_cache('pixelfed.media_types'),
-                'max:' . config_cache('pixelfed.max_photo_size'),
-            ],
-          'filter_name' => 'nullable|string|max:24',
-          'filter_class' => 'nullable|alpha_dash|max:24',
-          'description' => 'nullable|string|max:' . config_cache('pixelfed.max_altext_length'),
-          'replace_id' => 'sometimes'
-        ]);
+		$user = $request->user();
 
-        $user = $request->user();
+		if($user->last_active_at == null) {
+			return [];
+		}
 
-        if($user->last_active_at == null) {
-            return [];
-        }
+		if(empty($request->file('file'))) {
+			return response('', 422);
+		}
 
-        if(empty($request->file('file'))) {
-            return response('', 422);
-        }
+		$limitKey = 'compose:rate-limit:media-upload:' . $user->id;
+		$limitTtl = now()->addMinutes(15);
+		$limitReached = Cache::remember($limitKey, $limitTtl, function() use($user) {
+			$dailyLimit = Media::whereUserId($user->id)->where('created_at', '>', now()->subDays(1))->count();
 
-        $limitKey = 'compose:rate-limit:media-upload:' . $user->id;
-        $limitTtl = now()->addMinutes(15);
-        $limitReached = Cache::remember($limitKey, $limitTtl, function() use($user) {
-            $dailyLimit = Media::whereUserId($user->id)->where('created_at', '>', now()->subDays(1))->count();
+			return $dailyLimit >= 1250;
+		});
+		abort_if($limitReached == true, 429);
 
-            return $dailyLimit >= 1250;
-        });
-        abort_if($limitReached == true, 429);
+		$profile = $user->profile;
 
-        $profile = $user->profile;
+		if(config_cache('pixelfed.enforce_account_limit') == true) {
+			$size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) {
+				return Media::whereUserId($user->id)->sum('size') / 1000;
+			});
+			$limit = (int) config_cache('pixelfed.max_account_size');
+			if ($size >= $limit) {
+			   abort(403, 'Account size limit reached.');
+			}
+		}
 
-        if(config_cache('pixelfed.enforce_account_limit') == true) {
-            $size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) {
-                return Media::whereUserId($user->id)->sum('size') / 1000;
-            });
-            $limit = (int) config_cache('pixelfed.max_account_size');
-            if ($size >= $limit) {
-               abort(403, 'Account size limit reached.');
-            }
-        }
+		$filterClass = in_array($request->input('filter_class'), Filter::classes()) ? $request->input('filter_class') : null;
+		$filterName = in_array($request->input('filter_name'), Filter::names()) ? $request->input('filter_name') : null;
 
-        $filterClass = in_array($request->input('filter_class'), Filter::classes()) ? $request->input('filter_class') : null;
-        $filterName = in_array($request->input('filter_name'), Filter::names()) ? $request->input('filter_name') : null;
+		$photo = $request->file('file');
 
-        $photo = $request->file('file');
+		$mimes = explode(',', config_cache('pixelfed.media_types'));
+		if(in_array($photo->getMimeType(), $mimes) == false) {
+			abort(403, 'Invalid or unsupported mime type.');
+		}
 
-        $mimes = explode(',', config_cache('pixelfed.media_types'));
-        if(in_array($photo->getMimeType(), $mimes) == false) {
-            abort(403, 'Invalid or unsupported mime type.');
-        }
+		$storagePath = MediaPathService::get($user, 2);
+		$path = $photo->storePublicly($storagePath);
+		$hash = \hash_file('sha256', $photo);
+		$license = null;
+		$mime = $photo->getMimeType();
 
-        $storagePath = MediaPathService::get($user, 2);
-        $path = $photo->storePublicly($storagePath);
-        $hash = \hash_file('sha256', $photo);
-        $license = null;
-        $mime = $photo->getMimeType();
+		$settings = UserSetting::whereUserId($user->id)->first();
 
-        $settings = UserSetting::whereUserId($user->id)->first();
+		if($settings && !empty($settings->compose_settings)) {
+			$compose = $settings->compose_settings;
 
-        if($settings && !empty($settings->compose_settings)) {
-            $compose = $settings->compose_settings;
+			if(isset($compose['default_license']) && $compose['default_license'] != 1) {
+				$license = $compose['default_license'];
+			}
+		}
 
-            if(isset($compose['default_license']) && $compose['default_license'] != 1) {
-                $license = $compose['default_license'];
-            }
-        }
+		abort_if(MediaBlocklistService::exists($hash) == true, 451);
 
-        abort_if(MediaBlocklistService::exists($hash) == true, 451);
+		if($request->has('replace_id')) {
+			$rpid = $request->input('replace_id');
+			$removeMedia = Media::whereNull('status_id')
+				->whereUserId($user->id)
+				->whereProfileId($profile->id)
+				->where('created_at', '>', now()->subHours(2))
+				->find($rpid);
+			if($removeMedia) {
+				MediaDeletePipeline::dispatch($removeMedia)
+					->onQueue('mmo')
+					->delay(now()->addMinutes(15));
+			}
+		}
 
-        if($request->has('replace_id')) {
-            $rpid = $request->input('replace_id');
-            $removeMedia = Media::whereNull('status_id')
-                ->whereUserId($user->id)
-                ->whereProfileId($profile->id)
-                ->where('created_at', '>', now()->subHours(2))
-                ->find($rpid);
-            if($removeMedia) {
-                MediaDeletePipeline::dispatch($removeMedia)
-                    ->onQueue('mmo')
-                    ->delay(now()->addMinutes(15));
-            }
-        }
+		$media = new Media();
+		$media->status_id = null;
+		$media->profile_id = $profile->id;
+		$media->user_id = $user->id;
+		$media->media_path = $path;
+		$media->original_sha256 = $hash;
+		$media->size = $photo->getSize();
+		$media->mime = $mime;
+		$media->caption = $request->input('description');
+		$media->filter_class = $filterClass;
+		$media->filter_name = $filterName;
+		if($license) {
+			$media->license = $license;
+		}
+		$media->save();
 
-        $media = new Media();
-        $media->status_id = null;
-        $media->profile_id = $profile->id;
-        $media->user_id = $user->id;
-        $media->media_path = $path;
-        $media->original_sha256 = $hash;
-        $media->size = $photo->getSize();
-        $media->mime = $mime;
-        $media->caption = $request->input('description');
-        $media->filter_class = $filterClass;
-        $media->filter_name = $filterName;
-        if($license) {
-            $media->license = $license;
-        }
-        $media->save();
+		switch ($media->mime) {
+			case 'image/jpeg':
+			case 'image/png':
+				ImageOptimize::dispatch($media)->onQueue('mmo');
+				break;
 
-        switch ($media->mime) {
-            case 'image/jpeg':
-            case 'image/png':
-                ImageOptimize::dispatch($media)->onQueue('mmo');
-                break;
+			case 'video/mp4':
+				VideoThumbnail::dispatch($media)->onQueue('mmo');
+				$preview_url = '/storage/no-preview.png';
+				$url = '/storage/no-preview.png';
+				break;
+		}
 
-            case 'video/mp4':
-                VideoThumbnail::dispatch($media)->onQueue('mmo');
-                $preview_url = '/storage/no-preview.png';
-                $url = '/storage/no-preview.png';
-                break;
-        }
-
-        Cache::forget($limitKey);
-        $fractal = new Fractal\Manager();
-        $fractal->setSerializer(new ArraySerializer());
-        $resource = new Fractal\Resource\Item($media, new MediaTransformer());
-        $res = $fractal->createData($resource)->toArray();
-        $res['preview_url'] = $media->url(). '?v=' . time();
-        $res['url'] = null;
-        return $this->json($res, 202);
-    }
+		Cache::forget($limitKey);
+		$fractal = new Fractal\Manager();
+		$fractal->setSerializer(new ArraySerializer());
+		$resource = new Fractal\Resource\Item($media, new MediaTransformer());
+		$res = $fractal->createData($resource)->toArray();
+		$res['preview_url'] = $media->url(). '?v=' . time();
+		$res['url'] = null;
+		return $this->json($res, 202);
+	}
 }

app/Http/Controllers/Api/BaseApiController.php

@@ -99,7 +99,6 @@ class BaseApiController extends Controller
     public function avatarUpdate(Request $request)
     {
         abort_if(!$request->user(), 403);
-
         $this->validate($request, [
             'upload'   => 'required|mimetypes:image/jpeg,image/jpg,image/png|max:'.config('pixelfed.max_avatar_size'),
         ]);
@@ -135,10 +134,9 @@ class BaseApiController extends Controller
 
     public function verifyCredentials(Request $request)
     {
-        abort_if(!$request->user(), 403);
-
         $user = $request->user();
-        if ($user->status != null) {
+        abort_if(!$user, 403);
+        if($user->status != null) {
             Auth::logout();
             abort(403);
         }
@@ -149,7 +147,6 @@ class BaseApiController extends Controller
     public function accountLikes(Request $request)
     {
         abort_if(!$request->user(), 403);
-
         $this->validate($request, [
         	'page' => 'sometimes|int|min:1|max:20',
         	'limit' => 'sometimes|int|min:1|max:10'

app/Http/Controllers/Api/V1/DomainBlockController.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\V1;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\UserDomainBlock;
-use App\Util\ActivityPub\Helpers;
-use App\Services\UserFilterService;
-use Illuminate\Bus\Batch;
-use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Cache;
-use App\Jobs\HomeFeedPipeline\FeedRemoveDomainPipeline;
-use App\Jobs\ProfilePipeline\ProfilePurgeNotificationsByDomain;
-use App\Jobs\ProfilePipeline\ProfilePurgeFollowersByDomain;
-
-class DomainBlockController extends Controller
-{
-    public function json($res, $code = 200, $headers = [])
-    {
-        return response()->json($res, $code, $headers, JSON_UNESCAPED_SLASHES);
-    }
-
-    public function index(Request $request)
-    {
-        abort_if(!$request->user(), 403);
-
-        $this->validate($request, [
-            'limit' => 'sometimes|integer|min:1|max:200'
-        ]);
-        $limit = $request->input('limit', 100);
-        $id = $request->user()->profile_id;
-        $filters = UserDomainBlock::whereProfileId($id)->orderByDesc('id')->cursorPaginate($limit);
-        $links = null;
-        $headers = [];
-
-        if($filters->nextCursor()) {
-            $links .= '<'.$filters->nextPageUrl().'&limit='.$limit.'>; rel="next"';
-        }
-
-        if($filters->previousCursor()) {
-            if($links != null) {
-                $links .= ', ';
-            }
-            $links .= '<'.$filters->previousPageUrl().'&limit='.$limit.'>; rel="prev"';
-        }
-
-        if($links) {
-            $headers = ['Link' => $links];
-        }
-        return $this->json($filters->pluck('domain'), 200, $headers);
-    }
-
-    public function store(Request $request)
-    {
-        abort_if(!$request->user(), 403);
-
-        $this->validate($request, [
-            'domain' => 'required|active_url|min:1|max:120'
-        ]);
-
-        $pid = $request->user()->profile_id;
-
-        $domain = trim($request->input('domain'));
-
-        if(Helpers::validateUrl($domain) == false) {
-            return abort(500, 'Invalid domain or already blocked by server admins');
-        }
-
-        $domain = strtolower(parse_url($domain, PHP_URL_HOST));
-
-        abort_if(config_cache('pixelfed.domain.app') == $domain, 400, 'Cannot ban your own server');
-
-        $existingCount = UserDomainBlock::whereProfileId($pid)->count();
-        $maxLimit = (int) config_cache('instance.user_filters.max_domain_blocks');
-        $errorMsg =  __('profile.block.domain.max', ['max' => $maxLimit]);
-
-        abort_if($existingCount >= $maxLimit, 400, $errorMsg);
-
-        $block = UserDomainBlock::updateOrCreate([
-            'profile_id' => $pid,
-            'domain' => $domain
-        ]);
-
-        if($block->wasRecentlyCreated) {
-            Bus::batch([
-                [
-                    new FeedRemoveDomainPipeline($pid, $domain),
-                    new ProfilePurgeNotificationsByDomain($pid, $domain),
-                    new ProfilePurgeFollowersByDomain($pid, $domain)
-                ]
-            ])->allowFailures()->onQueue('feed')->dispatch();
-
-            Cache::forget('profile:following:' . $pid);
-            UserFilterService::domainBlocks($pid, true);
-        }
-
-        return $this->json([]);
-    }
-
-    public function delete(Request $request)
-    {
-        abort_if(!$request->user(), 403);
-
-        $this->validate($request, [
-            'domain' => 'required|min:1|max:120'
-        ]);
-
-        $pid = $request->user()->profile_id;
-
-        $domain = strtolower(trim($request->input('domain')));
-
-        $filters = UserDomainBlock::whereProfileId($pid)->whereDomain($domain)->delete();
-
-        UserFilterService::domainBlocks($pid, true);
-
-        return $this->json([]);
-    }
-}

app/Http/Controllers/Api/V1/TagsController.php

@@ -1,209 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\V1;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Hashtag;
-use App\HashtagFollow;
-use App\StatusHashtag;
-use App\Services\AccountService;
-use App\Services\HashtagService;
-use App\Services\HashtagFollowService;
-use App\Services\HashtagRelatedService;
-use App\Http\Resources\MastoApi\FollowedTagResource;
-use App\Jobs\HomeFeedPipeline\FeedWarmCachePipeline;
-use App\Jobs\HomeFeedPipeline\HashtagUnfollowPipeline;
-
-class TagsController extends Controller
-{
-    const PF_API_ENTITY_KEY = "_pe";
-
-    public function json($res, $code = 200, $headers = [])
-    {
-        return response()->json($res, $code, $headers, JSON_UNESCAPED_SLASHES);
-    }
-
-    /**
-    * GET /api/v1/tags/:id/related
-    *
-    *
-    * @return array
-    */
-    public function relatedTags(Request $request, $tag)
-    {
-        abort_if(!$request->user() || !$request->user()->token(), 403);
-        abort_unless($request->user()->tokenCan('read'), 403);
-
-        $tag = Hashtag::whereSlug($tag)->firstOrFail();
-        return HashtagRelatedService::get($tag->id);
-    }
-
-    /**
-    * POST /api/v1/tags/:id/follow
-    *
-    *
-    * @return object
-    */
-    public function followHashtag(Request $request, $id)
-    {
-        abort_if(!$request->user(), 403);
-
-        $pid = $request->user()->profile_id;
-        $account = AccountService::get($pid);
-
-        $operator = config('database.default') == 'pgsql' ? 'ilike' : 'like';
-        $tag = Hashtag::where('name', $operator, $id)
-            ->orWhere('slug', $operator, $id)
-            ->first();
-
-        abort_if(!$tag, 422, 'Unknown hashtag');
-
-        abort_if(
-            HashtagFollow::whereProfileId($pid)->count() >= HashtagFollow::MAX_LIMIT,
-            422,
-            'You cannot follow more than ' . HashtagFollow::MAX_LIMIT . ' hashtags.'
-        );
-
-        $follows = HashtagFollow::updateOrCreate(
-            [
-                'profile_id' => $account['id'],
-                'hashtag_id' => $tag->id
-            ],
-            [
-                'user_id' => $request->user()->id
-            ]
-        );
-
-        HashtagService::follow($pid, $tag->id);
-        HashtagFollowService::add($tag->id, $pid);
-
-        return response()->json(FollowedTagResource::make($follows)->toArray($request));
-    }
-
-    /**
-    * POST /api/v1/tags/:id/unfollow
-    *
-    *
-    * @return object
-    */
-    public function unfollowHashtag(Request $request, $id)
-    {
-        abort_if(!$request->user(), 403);
-
-        $pid = $request->user()->profile_id;
-        $account = AccountService::get($pid);
-
-        $operator = config('database.default') == 'pgsql' ? 'ilike' : 'like';
-        $tag = Hashtag::where('name', $operator, $id)
-            ->orWhere('slug', $operator, $id)
-            ->first();
-
-        abort_if(!$tag, 422, 'Unknown hashtag');
-
-        $follows = HashtagFollow::whereProfileId($pid)
-            ->whereHashtagId($tag->id)
-            ->first();
-
-        if(!$follows) {
-            return [
-                'name' => $tag->name,
-                'url' => config('app.url') . '/i/web/hashtag/' . $tag->slug,
-                'history' => [],
-                'following' => false
-            ];
-        }
-
-        if($follows) {
-            HashtagService::unfollow($pid, $tag->id);
-            HashtagFollowService::unfollow($tag->id, $pid);
-            HashtagUnfollowPipeline::dispatch($tag->id, $pid, $tag->slug)->onQueue('feed');
-            $follows->delete();
-        }
-
-        $res = FollowedTagResource::make($follows)->toArray($request);
-        $res['following'] = false;
-        return response()->json($res);
-    }
-
-    /**
-    * GET /api/v1/tags/:id
-    *
-    *
-    * @return object
-    */
-    public function getHashtag(Request $request, $id)
-    {
-        abort_if(!$request->user(), 403);
-
-        $pid = $request->user()->profile_id;
-        $account = AccountService::get($pid);
-        $operator = config('database.default') == 'pgsql' ? 'ilike' : 'like';
-        $tag = Hashtag::where('name', $operator, $id)
-            ->orWhere('slug', $operator, $id)
-            ->first();
-
-        if(!$tag) {
-            return [
-                'name' => $id,
-                'url' => config('app.url') . '/i/web/hashtag/' . $id,
-                'history' => [],
-                'following' => false
-            ];
-        }
-
-        $res = [
-            'name' => $tag->name,
-            'url' => config('app.url') . '/i/web/hashtag/' . $tag->slug,
-            'history' => [],
-            'following' => HashtagService::isFollowing($pid, $tag->id)
-        ];
-
-        if($request->has(self::PF_API_ENTITY_KEY)) {
-            $res['count'] = HashtagService::count($tag->id);
-        }
-
-        return $this->json($res);
-    }
-
-    /**
-    * GET /api/v1/followed_tags
-    *
-    *
-    * @return array
-    */
-    public function getFollowedTags(Request $request)
-    {
-        abort_if(!$request->user(), 403);
-
-        $account = AccountService::get($request->user()->profile_id);
-
-        $this->validate($request, [
-            'cursor' => 'sometimes',
-            'limit' => 'sometimes|integer|min:1|max:200'
-        ]);
-        $limit = $request->input('limit', 100);
-
-        $res = HashtagFollow::whereProfileId($account['id'])
-            ->orderByDesc('id')
-            ->cursorPaginate($limit)
-            ->withQueryString();
-
-        $pagination = false;
-        $prevPage = $res->nextPageUrl();
-        $nextPage = $res->previousPageUrl();
-        if($nextPage && $prevPage) {
-            $pagination = '<' . $nextPage . '>; rel="next", <' . $prevPage . '>; rel="prev"';
-        } else if($nextPage && !$prevPage) {
-            $pagination = '<' . $nextPage . '>; rel="next"';
-        } else if(!$nextPage && $prevPage) {
-            $pagination = '<' . $prevPage . '>; rel="prev"';
-        }
-
-        if($pagination) {
-            return response()->json(FollowedTagResource::collection($res)->collection)
-                ->header('Link', $pagination);
-        }
-        return response()->json(FollowedTagResource::collection($res)->collection);
-    }
-}

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -62,7 +62,7 @@ class ForgotPasswordController extends Controller
 
 		usleep(random_int(100000, 3000000));
 
-    	if((bool) config_cache('captcha.enabled')) {
+    	if(config('captcha.enabled')) {
             $rules = [
 	    		'email' => 'required|email',
             	'h-captcha-response' => 'required|captcha'

app/Http/Controllers/Auth/LoginController.php

@@ -71,21 +71,20 @@ class LoginController extends Controller
             $this->username() => 'required|email',
             'password'        => 'required|string|min:6',
         ];
-        $messages = [];
 
         if(
-        	(bool) config_cache('captcha.enabled') &&
-        	(bool) config_cache('captcha.active.login') ||
+        	config('captcha.enabled') ||
+        	config('captcha.active.login') ||
         	(
-				(bool) config_cache('captcha.triggers.login.enabled') &&
+				config('captcha.triggers.login.enabled') &&
 				request()->session()->has('login_attempts') &&
 				request()->session()->get('login_attempts') >= config('captcha.triggers.login.attempts')
 			)
         ) {
             $rules['h-captcha-response'] = 'required|filled|captcha|min:5';
-            $messages['h-captcha-response.required'] = 'The captcha must be filled';
         }
-        $request->validate($rules, $messages);
+        
+        $this->validate($request, $rules);
     }
 
     /**

app/Http/Controllers/Auth/RegisterController.php

@@ -60,7 +60,7 @@ class RegisterController extends Controller
 	 *
 	 * @return \Illuminate\Contracts\Validation\Validator
 	 */
-	public function validator(array $data)
+	protected function validator(array $data)
 	{
 		if(config('database.default') == 'pgsql') {
 			$data['username'] = strtolower($data['username']);
@@ -70,7 +70,7 @@ class RegisterController extends Controller
 		$usernameRules = [
 			'required',
 			'min:2',
-			'max:15',
+			'max:30',
 			'unique:users',
 			function ($attribute, $value, $fail) {
 				$dash = substr_count($value, '-');
@@ -137,7 +137,7 @@ class RegisterController extends Controller
 			'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
 		];
 
-		if((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register')) {
+		if(config('captcha.enabled') || config('captcha.active.register')) {
 			$rules['h-captcha-response'] = 'required|captcha';
 		}
 
@@ -151,7 +151,7 @@ class RegisterController extends Controller
 	 *
 	 * @return \App\User
 	 */
-	public function create(array $data)
+	protected function create(array $data)
 	{
 		if(config('database.default') == 'pgsql') {
 			$data['username'] = strtolower($data['username']);
@@ -174,7 +174,7 @@ class RegisterController extends Controller
 	 */
 	public function showRegistrationForm()
 	{
-		if((bool) config_cache('pixelfed.open_registration')) {
+		if(config_cache('pixelfed.open_registration')) {
 			if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
 				abort_if(BouncerService::checkIp(request()->ip()), 404);
 			}
@@ -191,11 +191,7 @@ class RegisterController extends Controller
 				return view('auth.register');
 			}
 		} else {
-			if((bool) config_cache('instance.curated_registration.enabled') && config('instance.curated_registration.state.fallback_on_closed_reg')) {
-				return redirect('/auth/sign_up');
-			} else {
-				abort(404);
-			}
+			abort(404);
 		}
 	}
 

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -50,7 +50,7 @@ class ResetPasswordController extends Controller
     {
     	usleep(random_int(100000, 3000000));
 
-        if((bool) config_cache('captcha.enabled')) {
+        if(config('captcha.enabled')) {
             return [
 	            'token' => 'required',
 	            'email' => 'required|email',

app/Http/Controllers/BookmarkController.php

@@ -8,56 +8,60 @@ use Auth;
 use Illuminate\Http\Request;
 use App\Services\BookmarkService;
 use App\Services\FollowerService;
-use App\Services\UserRoleService;
 
 class BookmarkController extends Controller
 {
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
+	public function __construct()
+	{
+		$this->middleware('auth');
+	}
 
-    public function store(Request $request)
-    {
-        $this->validate($request, [
-            'item' => 'required|integer|min:1',
-        ]);
+	public function store(Request $request)
+	{
+		$this->validate($request, [
+			'item' => 'required|integer|min:1',
+		]);
 
-        $user = $request->user();
-        $status = Status::findOrFail($request->input('item'));
+		$profile = Auth::user()->profile;
+		$status = Status::findOrFail($request->input('item'));
 
-        abort_if($user->has_roles && !UserRoleService::can('can-bookmark', $user->id), 403, 'Invalid permissions for this action');
-        abort_if($status->in_reply_to_id || $status->reblog_of_id, 404);
-        abort_if(!in_array($status->scope, ['public', 'unlisted', 'private']), 404);
-        abort_if(!in_array($status->type, ['photo','photo:album', 'video', 'video:album', 'photo:video:album']), 404);
+		abort_if($status->in_reply_to_id || $status->reblog_of_id, 404);
+		abort_if(!in_array($status->scope, ['public', 'unlisted', 'private']), 404);
+		abort_if(!in_array($status->type, ['photo','photo:album', 'video', 'video:album', 'photo:video:album']), 404);
 
-        if($status->scope == 'private') {
-            if($user->profile_id !== $status->profile_id && !FollowerService::follows($user->profile_id, $status->profile_id)) {
-                if($exists = Bookmark::whereStatusId($status->id)->whereProfileId($user->profile_id)->first()) {
-                    BookmarkService::del($user->profile_id, $status->id);
-                    $exists->delete();
+		if($status->scope == 'private') {
+			if($profile->id !== $status->profile_id && !FollowerService::follows($profile->id, $status->profile_id)) {
+				if($exists = Bookmark::whereStatusId($status->id)->whereProfileId($profile->id)->first()) {
+					BookmarkService::del($profile->id, $status->id);
+					$exists->delete();
 
-                    if ($request->ajax()) {
-                        return ['code' => 200, 'msg' => 'Bookmark removed!'];
-                    } else {
-                        return redirect()->back();
-                    }
-                }
-                abort(404, 'Error: You cannot bookmark private posts from accounts you do not follow.');
-            }
-        }
+					if ($request->ajax()) {
+						return ['code' => 200, 'msg' => 'Bookmark removed!'];
+					} else {
+						return redirect()->back();
+					}
+				}
+				abort(404, 'Error: You cannot bookmark private posts from accounts you do not follow.');
+			}
+		}
 
-        $bookmark = Bookmark::firstOrCreate(
-            ['status_id' => $status->id], ['profile_id' => $user->profile_id]
-        );
+		$bookmark = Bookmark::firstOrCreate(
+			['status_id' => $status->id], ['profile_id' => $profile->id]
+		);
 
-        if (!$bookmark->wasRecentlyCreated) {
-            BookmarkService::del($user->profile_id, $status->id);
-            $bookmark->delete();
-        } else {
-            BookmarkService::add($user->profile_id, $status->id);
-        }
+		if (!$bookmark->wasRecentlyCreated) {
+			BookmarkService::del($profile->id, $status->id);
+			$bookmark->delete();
+		} else {
+			BookmarkService::add($profile->id, $status->id);
+		}
 
-        return $request->expectsJson() ? ['code' => 200, 'msg' => 'Bookmark saved!'] : redirect()->back();
-    }
+		if ($request->ajax()) {
+			$response = ['code' => 200, 'msg' => 'Bookmark saved!'];
+		} else {
+			$response = redirect()->back();
+		}
+
+		return $response;
+	}
 }

app/Http/Controllers/CollectionController.php

@@ -153,7 +153,7 @@ class CollectionController extends Controller
             abort(400, 'You can only add '.$max.' posts per collection');
         }
 
-        $status = Status::whereIn('scope', ['public', 'unlisted'])
+        $status = Status::whereScope('public')
             ->whereProfileId($profileId)
             ->whereIn('type', ['photo', 'photo:album', 'video'])
             ->findOrFail($postId);
@@ -166,13 +166,17 @@ class CollectionController extends Controller
             'order'         => $count,
         ]);
 
-        CollectionService::deleteCollection($collection->id);
+        CollectionService::addItem(
+        	$collection->id,
+        	$status->id,
+        	$count
+        );
 
         $collection->updated_at = now();
         $collection->save();
         CollectionService::setCollection($collection->id, $collection);
 
-        return StatusService::get($status->id, false);
+        return StatusService::get($status->id);
     }
 
     public function getCollection(Request $request, $id)
@@ -222,10 +226,10 @@ class CollectionController extends Controller
 
         return collect($items)
         	->map(function($id) {
-                return StatusService::get($id, false);
+        		return StatusService::get($id);
         	})
         	->filter(function($item) {
-                return $item && ($item['visibility'] == 'public' ||  $item['visibility'] == 'unlisted') && isset($item['account'], $item['media_attachments']);
+        		return $item && isset($item['account'], $item['media_attachments']);
         	})
         	->values();
     }
@@ -294,7 +298,7 @@ class CollectionController extends Controller
             abort(400, 'You cannot delete the only post of a collection!');
         }
 
-        $status = Status::whereIn('scope', ['public', 'unlisted'])
+        $status = Status::whereScope('public')
             ->whereIn('type', ['photo', 'photo:album', 'video'])
             ->findOrFail($postId);
 

app/Http/Controllers/CommentController.php

@@ -2,18 +2,23 @@
 
 namespace App\Http\Controllers;
 
-use App\Jobs\CommentPipeline\CommentPipeline;
-use App\Jobs\StatusPipeline\NewStatusPipeline;
-use App\Services\StatusService;
-use App\Status;
-use App\Transformer\Api\StatusTransformer;
-use App\UserFilter;
-use App\Util\Lexer\Autolink;
+use Illuminate\Http\Request;
 use Auth;
 use DB;
-use Illuminate\Http\Request;
+use Cache;
+
+use App\Comment;
+use App\Jobs\CommentPipeline\CommentPipeline;
+use App\Jobs\StatusPipeline\NewStatusPipeline;
+use App\Util\Lexer\Autolink;
+use App\Profile;
+use App\Status;
+use App\UserFilter;
 use League\Fractal;
+use App\Transformer\Api\StatusTransformer;
 use League\Fractal\Serializer\ArraySerializer;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use App\Services\StatusService;
 
 class CommentController extends Controller
 {
@@ -28,9 +33,9 @@ class CommentController extends Controller
             abort(403);
         }
         $this->validate($request, [
-            'item' => 'required|integer|min:1',
-            'comment' => 'required|string|max:'.config_cache('pixelfed.max_caption_length'),
-            'sensitive' => 'nullable|boolean',
+            'item'    => 'required|integer|min:1',
+            'comment' => 'required|string|max:'.(int) config('pixelfed.max_caption_length'),
+            'sensitive' => 'nullable|boolean'
         ]);
         $comment = $request->input('comment');
         $statusId = $request->input('item');
@@ -40,7 +45,7 @@ class CommentController extends Controller
         $profile = $user->profile;
         $status = Status::findOrFail($statusId);
 
-        if ($status->comments_disabled == true) {
+        if($status->comments_disabled == true) {
             return;
         }
 
@@ -50,11 +55,11 @@ class CommentController extends Controller
             ->whereFilterableId($profile->id)
             ->exists();
 
-        if ($filtered == true) {
+        if($filtered == true) {
             return;
         }
 
-        $reply = DB::transaction(function () use ($comment, $status, $profile, $nsfw) {
+        $reply = DB::transaction(function() use($comment, $status, $profile, $nsfw) {
             $scope = $profile->is_private == true ? 'private' : 'public';
             $autolink = Autolink::create()->autolink($comment);
             $reply = new Status();

app/Http/Controllers/CuratedRegisterController.php

@@ -1,399 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use App\User;
-use App\Models\CuratedRegister;
-use App\Models\CuratedRegisterActivity;
-use App\Services\EmailService;
-use App\Services\BouncerService;
-use App\Util\Lexer\RestrictedNames;
-use App\Mail\CuratedRegisterConfirmEmail;
-use App\Mail\CuratedRegisterNotifyAdmin;
-use Illuminate\Support\Facades\Mail;
-use App\Jobs\CuratedOnboarding\CuratedOnboardingNotifyAdminNewApplicationPipeline;
-
-class CuratedRegisterController extends Controller
-{
-    public function __construct()
-    {
-        abort_unless((bool) config_cache('instance.curated_registration.enabled'), 404);
-
-        if((bool) config_cache('pixelfed.open_registration')) {
-            abort_if(config('instance.curated_registration.state.only_enabled_on_closed_reg'), 404);
-        } else {
-            abort_unless(config('instance.curated_registration.state.fallback_on_closed_reg'), 404);
-        }
-    }
-
-    public function index(Request $request)
-    {
-        abort_if($request->user(), 404);
-        return view('auth.curated-register.index', ['step' => 1]);
-    }
-
-    public function concierge(Request $request)
-    {
-        abort_if($request->user(), 404);
-        $emailConfirmed = $request->session()->has('cur-reg-con.email-confirmed') &&
-            $request->has('next') &&
-            $request->session()->has('cur-reg-con.cr-id');
-        return view('auth.curated-register.concierge', compact('emailConfirmed'));
-    }
-
-    public function conciergeResponseSent(Request $request)
-    {
-        return view('auth.curated-register.user_response_sent');
-    }
-
-    public function conciergeFormShow(Request $request)
-    {
-        abort_if($request->user(), 404);
-        abort_unless(
-            $request->session()->has('cur-reg-con.email-confirmed') &&
-            $request->session()->has('cur-reg-con.cr-id') &&
-            $request->session()->has('cur-reg-con.ac-id'), 404);
-        $crid = $request->session()->get('cur-reg-con.cr-id');
-        $arid = $request->session()->get('cur-reg-con.ac-id');
-        $showCaptcha = config('instance.curated_registration.captcha_enabled');
-        if($attempts = $request->session()->get('cur-reg-con-attempt')) {
-            $showCaptcha = $attempts && $attempts >= 2;
-        } else {
-            $showCaptcha = false;
-        }
-        $activity = CuratedRegisterActivity::whereRegisterId($crid)->whereFromAdmin(true)->findOrFail($arid);
-        return view('auth.curated-register.concierge_form', compact('activity', 'showCaptcha'));
-    }
-
-    public function conciergeFormStore(Request $request)
-    {
-        abort_if($request->user(), 404);
-        $request->session()->increment('cur-reg-con-attempt');
-        abort_unless(
-            $request->session()->has('cur-reg-con.email-confirmed') &&
-            $request->session()->has('cur-reg-con.cr-id') &&
-            $request->session()->has('cur-reg-con.ac-id'), 404);
-        $attempts = $request->session()->get('cur-reg-con-attempt');
-        $messages = [];
-        $rules = [
-            'response' => 'required|string|min:5|max:1000',
-            'crid' => 'required|integer|min:1',
-            'acid' => 'required|integer|min:1'
-        ];
-        if(config('instance.curated_registration.captcha_enabled') && $attempts >= 3) {
-            $rules['h-captcha-response'] = 'required|captcha';
-            $messages['h-captcha-response.required'] = 'The captcha must be filled';
-        }
-        $this->validate($request, $rules, $messages);
-        $crid = $request->session()->get('cur-reg-con.cr-id');
-        $acid = $request->session()->get('cur-reg-con.ac-id');
-        abort_if((string) $crid !== $request->input('crid'), 404);
-        abort_if((string) $acid !== $request->input('acid'), 404);
-
-        if(CuratedRegisterActivity::whereRegisterId($crid)->whereReplyToId($acid)->exists()) {
-            return redirect()->back()->withErrors(['code' => 'You already replied to this request.']);
-        }
-
-        $act = CuratedRegisterActivity::create([
-            'register_id' => $crid,
-            'reply_to_id' => $acid,
-            'type' => 'user_response',
-            'message' => $request->input('response'),
-            'from_user' => true,
-            'action_required' => true,
-        ]);
-
-        CuratedRegister::findOrFail($crid)->update(['user_has_responded' => true]);
-        $request->session()->pull('cur-reg-con');
-        $request->session()->pull('cur-reg-con-attempt');
-
-        return view('auth.curated-register.user_response_sent');
-    }
-
-    public function conciergeStore(Request $request)
-    {
-        abort_if($request->user(), 404);
-        $rules = [
-            'sid' => 'required_if:action,email|integer|min:1|max:20000000',
-            'id' => 'required_if:action,email|integer|min:1|max:20000000',
-            'code' => 'required_if:action,email',
-            'action' => 'required|string|in:email,message',
-            'email' => 'required_if:action,email|email',
-            'response' => 'required_if:action,message|string|min:20|max:1000',
-        ];
-        $messages = [];
-        if(config('instance.curated_registration.captcha_enabled')) {
-            $rules['h-captcha-response'] = 'required|captcha';
-            $messages['h-captcha-response.required'] = 'The captcha must be filled';
-        }
-        $this->validate($request, $rules, $messages);
-
-        $action = $request->input('action');
-        $sid = $request->input('sid');
-        $id = $request->input('id');
-        $code = $request->input('code');
-        $email = $request->input('email');
-
-        $cr = CuratedRegister::whereIsClosed(false)->findOrFail($sid);
-        $ac = CuratedRegisterActivity::whereRegisterId($cr->id)->whereFromAdmin(true)->findOrFail($id);
-
-        if(!hash_equals($ac->secret_code, $code)) {
-            return redirect()->back()->withErrors(['code' => 'Invalid code']);
-        }
-
-        if(!hash_equals($cr->email, $email)) {
-            return redirect()->back()->withErrors(['email' => 'Invalid email']);
-        }
-
-        $request->session()->put('cur-reg-con.email-confirmed', true);
-        $request->session()->put('cur-reg-con.cr-id', $cr->id);
-        $request->session()->put('cur-reg-con.ac-id', $ac->id);
-        $emailConfirmed = true;
-        return redirect('/auth/sign_up/concierge/form');
-    }
-
-    public function confirmEmail(Request $request)
-    {
-        if($request->user()) {
-            return redirect(route('help.email-confirmation-issues'));
-        }
-        return view('auth.curated-register.confirm_email');
-    }
-
-    public function emailConfirmed(Request $request)
-    {
-        if($request->user()) {
-            return redirect(route('help.email-confirmation-issues'));
-        }
-        return view('auth.curated-register.email_confirmed');
-    }
-
-    public function resendConfirmation(Request $request)
-    {
-        return view('auth.curated-register.resend-confirmation');
-    }
-
-    public function resendConfirmationProcess(Request $request)
-    {
-        $rules = [
-            'email' => [
-                'required',
-                'string',
-                app()->environment() === 'production' ? 'email:rfc,dns,spoof' : 'email',
-                'exists:curated_registers',
-            ]
-        ];
-
-        $messages = [];
-
-        if(config('instance.curated_registration.captcha_enabled')) {
-            $rules['h-captcha-response'] = 'required|captcha';
-            $messages['h-captcha-response.required'] = 'The captcha must be filled';
-        }
-
-        $this->validate($request, $rules, $messages);
-
-        $cur = CuratedRegister::whereEmail($request->input('email'))->whereIsClosed(false)->first();
-        if(!$cur) {
-            return redirect()->back()->withErrors(['email' => 'The selected email is invalid.']);
-        }
-
-        $totalCount = CuratedRegisterActivity::whereRegisterId($cur->id)
-            ->whereType('user_resend_email_confirmation')
-            ->count();
-
-        if($totalCount && $totalCount >= config('instance.curated_registration.resend_confirmation_limit')) {
-            return redirect()->back()->withErrors(['email' => 'You have re-attempted too many times. To proceed with your application, please <a href="/site/contact" class="text-white" style="text-decoration: underline;">contact the admin team</a>.']);
-        }
-
-        $count = CuratedRegisterActivity::whereRegisterId($cur->id)
-            ->whereType('user_resend_email_confirmation')
-            ->where('created_at', '>', now()->subHours(12))
-            ->count();
-
-        if($count) {
-            return redirect()->back()->withErrors(['email' => 'You can only re-send the confirmation email once per 12 hours. Try again later.']);
-        }
-
-        CuratedRegisterActivity::create([
-            'register_id' => $cur->id,
-            'type' => 'user_resend_email_confirmation',
-            'admin_only_view' => true,
-            'from_admin' => false,
-            'from_user' => false,
-            'action_required' => false,
-        ]);
-
-        Mail::to($cur->email)->send(new CuratedRegisterConfirmEmail($cur));
-        return view('auth.curated-register.resent-confirmation');
-        return $request->all();
-    }
-
-    public function confirmEmailHandle(Request $request)
-    {
-        $rules = [
-            'sid' => 'required',
-            'code' => 'required'
-        ];
-        $messages = [];
-        if(config('instance.curated_registration.captcha_enabled')) {
-            $rules['h-captcha-response'] = 'required|captcha';
-            $messages['h-captcha-response.required'] = 'The captcha must be filled';
-        }
-        $this->validate($request, $rules, $messages);
-
-        $cr = CuratedRegister::whereNull('email_verified_at')
-            ->where('created_at', '>', now()->subHours(24))
-            ->find($request->input('sid'));
-        if(!$cr) {
-            return redirect(route('help.email-confirmation-issues'));
-        }
-        if(!hash_equals($cr->verify_code, $request->input('code'))) {
-            return redirect(route('help.email-confirmation-issues'));
-        }
-        $cr->email_verified_at = now();
-        $cr->save();
-
-        if(config('instance.curated_registration.notify.admin.on_verify_email.enabled')) {
-            CuratedOnboardingNotifyAdminNewApplicationPipeline::dispatch($cr);
-        }
-        return view('auth.curated-register.email_confirmed');
-    }
-
-    public function proceed(Request $request)
-    {
-        $this->validate($request, [
-            'step' => 'required|integer|in:1,2,3,4'
-        ]);
-        $step = $request->input('step');
-
-        switch($step) {
-            case 1:
-                $step = 2;
-                $request->session()->put('cur-step', 1);
-                return view('auth.curated-register.index', compact('step'));
-            break;
-
-            case 2:
-                $this->stepTwo($request);
-                $step = 3;
-                $request->session()->put('cur-step', 2);
-                return view('auth.curated-register.index', compact('step'));
-            break;
-
-            case 3:
-                $this->stepThree($request);
-                $step = 3;
-                $request->session()->put('cur-step', 3);
-                $verifiedEmail = true;
-                $request->session()->pull('cur-reg');
-                return view('auth.curated-register.index', compact('step', 'verifiedEmail'));
-            break;
-        }
-    }
-
-    protected function stepTwo($request)
-    {
-        if($request->filled('reason')) {
-            $request->session()->put('cur-reg.form-reason', $request->input('reason'));
-        }
-        if($request->filled('username')) {
-            $request->session()->put('cur-reg.form-username', $request->input('username'));
-        }
-        if($request->filled('email')) {
-            $request->session()->put('cur-reg.form-email', $request->input('email'));
-        }
-        $this->validate($request, [
-            'username' => [
-                'required',
-                'min:2',
-                'max:15',
-                'unique:curated_registers',
-                'unique:users',
-                function ($attribute, $value, $fail) {
-                    $dash = substr_count($value, '-');
-                    $underscore = substr_count($value, '_');
-                    $period = substr_count($value, '.');
-
-                    if(ends_with($value, ['.php', '.js', '.css'])) {
-                        return $fail('Username is invalid.');
-                    }
-
-                    if(($dash + $underscore + $period) > 1) {
-                        return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).');
-                    }
-
-                    if (!ctype_alnum($value[0])) {
-                        return $fail('Username is invalid. Must start with a letter or number.');
-                    }
-
-                    if (!ctype_alnum($value[strlen($value) - 1])) {
-                        return $fail('Username is invalid. Must end with a letter or number.');
-                    }
-
-                    $val = str_replace(['_', '.', '-'], '', $value);
-                    if(!ctype_alnum($val)) {
-                        return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).');
-                    }
-
-                    $restricted = RestrictedNames::get();
-                    if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
-                        return $fail('Username cannot be used.');
-                    }
-                },
-            ],
-            'email' => [
-                'required',
-                'string',
-                app()->environment() === 'production' ? 'email:rfc,dns,spoof' : 'email',
-                'max:255',
-                'unique:users',
-                'unique:curated_registers',
-                function ($attribute, $value, $fail) {
-                    $banned = EmailService::isBanned($value);
-                    if($banned) {
-                        return $fail('Email is invalid.');
-                    }
-                },
-            ],
-            'password' => 'required|min:8',
-            'password_confirmation' => 'required|same:password',
-            'reason' => 'required|min:20|max:1000',
-            'agree' => 'required|accepted'
-        ]);
-        $request->session()->put('cur-reg.form-email', $request->input('email'));
-        $request->session()->put('cur-reg.form-password', $request->input('password'));
-    }
-
-    protected function stepThree($request)
-    {
-        $this->validate($request, [
-            'email' => [
-                'required',
-                'string',
-                app()->environment() === 'production' ? 'email:rfc,dns,spoof' : 'email',
-                'max:255',
-                'unique:users',
-                'unique:curated_registers',
-                function ($attribute, $value, $fail) {
-                    $banned = EmailService::isBanned($value);
-                    if($banned) {
-                        return $fail('Email is invalid.');
-                    }
-                },
-            ]
-        ]);
-        $cr = new CuratedRegister;
-        $cr->email = $request->email;
-        $cr->username = $request->session()->get('cur-reg.form-username');
-        $cr->password = bcrypt($request->session()->get('cur-reg.form-password'));
-        $cr->ip_address = $request->ip();
-        $cr->reason_to_join = $request->session()->get('cur-reg.form-reason');
-        $cr->verify_code = Str::random(40);
-        $cr->save();
-
-        Mail::to($cr->email)->send(new CuratedRegisterConfirmEmail($cr));
-    }
-}

app/Http/Controllers/DiscoverController.php

@@ -2,422 +2,366 @@
 
 namespace App\Http\Controllers;
 
-use App\Hashtag;
-use App\Instance;
-use App\Like;
-use App\Services\AccountService;
-use App\Services\AdminShadowFilterService;
+use App\{
+	DiscoverCategory,
+	Follower,
+	Hashtag,
+	HashtagFollow,
+	Instance,
+	Like,
+	Profile,
+	Status,
+	StatusHashtag,
+	UserFilter
+};
+use Auth, DB, Cache;
+use Illuminate\Http\Request;
 use App\Services\BookmarkService;
 use App\Services\ConfigCacheService;
-use App\Services\FollowerService;
 use App\Services\HashtagService;
 use App\Services\LikeService;
 use App\Services\ReblogService;
-use App\Services\SnowflakeService;
 use App\Services\StatusHashtagService;
+use App\Services\SnowflakeService;
 use App\Services\StatusService;
 use App\Services\TrendingHashtagService;
 use App\Services\UserFilterService;
-use App\Status;
-use Auth;
-use Cache;
-use DB;
-use Illuminate\Http\Request;
 
 class DiscoverController extends Controller
 {
-    public function home(Request $request)
-    {
-        abort_if(! Auth::check() && config('instance.discover.public') == false, 403);
+	public function home(Request $request)
+	{
+		abort_if(!Auth::check() && config('instance.discover.public') == false, 403);
+		return view('discover.home');
+	}
 
-        return view('discover.home');
-    }
+	public function showTags(Request $request, $hashtag)
+	{
+			abort_if(!config('instance.discover.tags.is_public') && !Auth::check(), 403);
 
-    public function showTags(Request $request, $hashtag)
-    {
-        if ($request->user()) {
-            return redirect('/i/web/hashtag/'.$hashtag.'?src=pd');
-        }
-        abort_if(! config('instance.discover.tags.is_public') && ! Auth::check(), 403);
+			$tag = Hashtag::whereName($hashtag)
+				->orWhere('slug', $hashtag)
+				->where('is_banned', '!=', true)
+				->firstOrFail();
+			$tagCount = StatusHashtagService::count($tag->id);
+			return view('discover.tags.show', compact('tag', 'tagCount'));
+	}
 
-        $tag = Hashtag::whereName($hashtag)
-            ->orWhere('slug', $hashtag)
-            ->where('is_banned', '!=', true)
-            ->firstOrFail();
-        $tagCount = $tag->cached_count ?? 0;
+	public function getHashtags(Request $request)
+	{
+		$user = $request->user();
+		abort_if(!config('instance.discover.tags.is_public') && !$user, 403);
 
-        return view('discover.tags.show', compact('tag', 'tagCount'));
-    }
+		$this->validate($request, [
+			'hashtag' => 'required|string|min:1|max:124',
+			'page' => 'nullable|integer|min:1|max:' . ($user ? 29 : 3)
+		]);
 
-    public function getHashtags(Request $request)
-    {
-        $user = $request->user();
-        abort_if(! config('instance.discover.tags.is_public') && ! $user, 403);
+		$page = $request->input('page') ?? '1';
+		$end = $page > 1 ? $page * 9 : 0;
+		$tag = $request->input('hashtag');
 
-        $this->validate($request, [
-            'hashtag' => 'required|string|min:1|max:124',
-            'page' => 'nullable|integer|min:1|max:'.($user ? 29 : 3),
-        ]);
+		if(config('database.default') === 'pgsql') {
+			$hashtag = Hashtag::where('name', 'ilike', $tag)->firstOrFail();
+		} else {
+			$hashtag = Hashtag::whereName($tag)->firstOrFail();
+		}
 
-        $page = $request->input('page') ?? '1';
-        $end = $page > 1 ? $page * 9 : 0;
-        $tag = $request->input('hashtag');
+		if($hashtag->is_banned == true) {
+			return [];
+		}
+		if($user) {
+			$res['follows'] = HashtagService::isFollowing($user->profile_id, $hashtag->id);
+		}
+		$res['hashtag'] = [
+			'name' => $hashtag->name,
+			'url' => $hashtag->url()
+		];
+		if($user) {
+			$tags = StatusHashtagService::get($hashtag->id, $page, $end);
+			$res['tags'] = collect($tags)
+				->map(function($tag) use($user) {
+					$tag['status']['favourited'] = (bool) LikeService::liked($user->profile_id, $tag['status']['id']);
+					$tag['status']['reblogged'] = (bool) ReblogService::get($user->profile_id, $tag['status']['id']);
+					$tag['status']['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $tag['status']['id']);
+					return $tag;
+				})
+				->filter(function($tag) {
+					if(!StatusService::get($tag['status']['id'])) {
+						return false;
+					}
+					return true;
+				})
+				->values();
+		} else {
+			if($page != 1) {
+				$res['tags'] = [];
+				return $res;
+			}
+			$key = 'discover:tags:public_feed:' . $hashtag->id . ':page:' . $page;
+			$tags = Cache::remember($key, 43200, function() use($hashtag, $page, $end) {
+				return collect(StatusHashtagService::get($hashtag->id, $page, $end))
+					->filter(function($tag) {
+						if(!$tag['status']['local']) {
+							return false;
+						}
+						return true;
+					})
+					->values();
+			});
+			$res['tags'] = collect($tags)
+				->filter(function($tag) {
+					if(!StatusService::get($tag['status']['id'])) {
+						return false;
+					}
+					return true;
+				})
+				->values();
+		}
+		return $res;
+	}
 
-        if (config('database.default') === 'pgsql') {
-            $hashtag = Hashtag::where('name', 'ilike', $tag)->firstOrFail();
-        } else {
-            $hashtag = Hashtag::whereName($tag)->firstOrFail();
-        }
+	public function profilesDirectory(Request $request)
+	{
+		return redirect('/')->with('statusRedirect', 'The Profile Directory is unavailable at this time.');
+	}
 
-        if ($hashtag->is_banned == true) {
-            return [];
-        }
-        if ($user) {
-            $res['follows'] = HashtagService::isFollowing($user->profile_id, $hashtag->id);
-        }
-        $res['hashtag'] = [
-            'name' => $hashtag->name,
-            'url' => $hashtag->url(),
-        ];
-        if ($user) {
-            $tags = StatusHashtagService::get($hashtag->id, $page, $end);
-            $res['tags'] = collect($tags)
-                ->map(function ($tag) use ($user) {
-                    $tag['status']['favourited'] = (bool) LikeService::liked($user->profile_id, $tag['status']['id']);
-                    $tag['status']['reblogged'] = (bool) ReblogService::get($user->profile_id, $tag['status']['id']);
-                    $tag['status']['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $tag['status']['id']);
+	public function profilesDirectoryApi(Request $request)
+	{
+		return ['error' => 'Temporarily unavailable.'];
+	}
 
-                    return $tag;
-                })
-                ->filter(function ($tag) {
-                    if (! StatusService::get($tag['status']['id'])) {
-                        return false;
-                    }
+	public function trendingApi(Request $request)
+	{
+		abort_if(config('instance.discover.public') == false && !$request->user(), 403);
 
-                    return true;
-                })
-                ->values();
-        } else {
-            if ($page != 1) {
-                $res['tags'] = [];
+		$this->validate($request, [
+			'range' => 'nullable|string|in:daily,monthly,yearly',
+		]);
 
-                return $res;
-            }
-            $key = 'discover:tags:public_feed:'.$hashtag->id.':page:'.$page;
-            $tags = Cache::remember($key, 43200, function () use ($hashtag, $page, $end) {
-                return collect(StatusHashtagService::get($hashtag->id, $page, $end))
-                    ->filter(function ($tag) {
-                        if (! $tag['status']['local']) {
-                            return false;
-                        }
+		$range = $request->input('range');
+		$days = $range == 'monthly' ? 31 : ($range == 'daily' ? 1 : 365);
+		$ttls = [
+			1 => 1500,
+			31 => 14400,
+			365 => 86400
+		];
+		$key = ':api:discover:trending:v2.12:range:' . $days;
 
-                        return true;
-                    })
-                    ->values();
-            });
-            $res['tags'] = collect($tags)
-                ->filter(function ($tag) {
-                    if (! StatusService::get($tag['status']['id'])) {
-                        return false;
-                    }
+		$ids = Cache::remember($key, $ttls[$days], function() use($days) {
+			$min_id = SnowflakeService::byDate(now()->subDays($days));
+			return DB::table('statuses')
+				->select(
+					'id',
+					'scope',
+					'type',
+					'is_nsfw',
+					'likes_count',
+					'created_at'
+				)
+				->where('id', '>', $min_id)
+				->whereNull('uri')
+				->whereScope('public')
+				->whereIn('type', [
+					'photo',
+					'photo:album',
+					'video'
+				])
+				->whereIsNsfw(false)
+				->orderBy('likes_count','desc')
+				->take(30)
+				->pluck('id');
+		});
 
-                    return true;
-                })
-                ->values();
-        }
+		$filtered = Auth::check() ? UserFilterService::filters(Auth::user()->profile_id) : [];
 
-        return $res;
-    }
+		$res = $ids->map(function($s) {
+			return StatusService::get($s);
+		})->filter(function($s) use($filtered) {
+			return
+				$s &&
+				!in_array($s['account']['id'], $filtered) &&
+				isset($s['account']);
+		})->values();
 
-    public function profilesDirectory(Request $request)
-    {
-        return redirect('/')->with('statusRedirect', 'The Profile Directory is unavailable at this time.');
-    }
+		return response()->json($res);
+	}
 
-    public function profilesDirectoryApi(Request $request)
-    {
-        return ['error' => 'Temporarily unavailable.'];
-    }
+	public function trendingHashtags(Request $request)
+	{
+		abort_if(!$request->user(), 403);
 
-    public function trendingApi(Request $request)
-    {
-        abort_if(config('instance.discover.public') == false && ! $request->user(), 403);
+		$res = TrendingHashtagService::getTrending();
+		return $res;
+	}
 
-        $this->validate($request, [
-            'range' => 'nullable|string|in:daily,monthly,yearly',
-        ]);
+	public function trendingPlaces(Request $request)
+	{
+		return [];
+	}
 
-        $range = $request->input('range');
-        $days = $range == 'monthly' ? 31 : ($range == 'daily' ? 1 : 365);
-        $ttls = [
-            1 => 1500,
-            31 => 14400,
-            365 => 86400,
-        ];
-        $key = ':api:discover:trending:v2.12:range:'.$days;
+	public function myMemories(Request $request)
+	{
+		abort_if(!$request->user(), 404);
+		$pid = $request->user()->profile_id;
+		abort_if(!$this->config()['memories']['enabled'], 404);
+		$type = $request->input('type') ?? 'posts';
 
-        $ids = Cache::remember($key, $ttls[$days], function () use ($days) {
-            $min_id = SnowflakeService::byDate(now()->subDays($days));
+		switch($type) {
+			case 'posts':
+				$res = Status::whereProfileId($pid)
+					->whereDay('created_at', date('d'))
+					->whereMonth('created_at', date('m'))
+					->whereYear('created_at', '!=', date('Y'))
+					->whereNull(['reblog_of_id', 'in_reply_to_id'])
+					->limit(20)
+					->pluck('id')
+					->map(function($id) {
+						return StatusService::get($id, false);
+					})
+					->filter(function($post) {
+						return $post && isset($post['account']);
+					})
+					->values();
+			break;
 
-            return DB::table('statuses')
-                ->select(
-                    'id',
-                    'scope',
-                    'type',
-                    'is_nsfw',
-                    'likes_count',
-                    'created_at'
-                )
-                ->where('id', '>', $min_id)
-                ->whereNull('uri')
-                ->whereScope('public')
-                ->whereIn('type', [
-                    'photo',
-                    'photo:album',
-                    'video',
-                ])
-                ->whereIsNsfw(false)
-                ->orderBy('likes_count', 'desc')
-                ->take(30)
-                ->pluck('id');
-        });
+			case 'liked':
+				$res = Like::whereProfileId($pid)
+					->whereDay('created_at', date('d'))
+					->whereMonth('created_at', date('m'))
+					->whereYear('created_at', '!=', date('Y'))
+					->orderByDesc('status_id')
+					->limit(20)
+					->pluck('status_id')
+					->map(function($id) {
+						$status = StatusService::get($id, false);
+						$status['favourited'] = true;
+						return $status;
+					})
+					->filter(function($post) {
+						return $post && isset($post['account']);
+					})
+					->values();
+			break;
+		}
 
-        $filtered = Auth::check() ? UserFilterService::filters(Auth::user()->profile_id) : [];
+		return $res;
+	}
 
-        $res = $ids->map(function ($s) {
-            return StatusService::get($s);
-        })->filter(function ($s) use ($filtered) {
-            return
-                $s &&
-                ! in_array($s['account']['id'], $filtered) &&
-                isset($s['account']);
-        })->values();
+	public function accountInsightsPopularPosts(Request $request)
+	{
+		abort_if(!$request->user(), 404);
+		$pid = $request->user()->profile_id;
+		abort_if(!$this->config()['insights']['enabled'], 404);
+		$posts = Cache::remember('pf:discover:metro2:accinsights:popular:' . $pid, 43200, function() use ($pid) {
+			return Status::whereProfileId($pid)
+			->whereNotNull('likes_count')
+			->orderByDesc('likes_count')
+			->limit(12)
+			->pluck('id')
+			->map(function($id) {
+				return StatusService::get($id, false);
+			})
+			->filter(function($post) {
+				return $post && isset($post['account']);
+			})
+			->values();
+		});
 
-        return response()->json($res);
-    }
+		return $posts;
+	}
 
-    public function trendingHashtags(Request $request)
-    {
-        abort_if(! $request->user(), 403);
+	public function config()
+	{
+		$cc = ConfigCacheService::get('config.discover.features');
+		if($cc) {
+			return is_string($cc) ? json_decode($cc, true) : $cc;
+		}
+		return [
+			'hashtags' => [
+				'enabled' => true,
+			],
+			'memories' => [
+				'enabled' => true,
+			],
+			'insights' => [
+				'enabled' => true,
+			],
+			'friends' => [
+				'enabled' => true,
+			],
+			'server' => [
+				'enabled' => false,
+				'mode' => 'allowlist',
+				'domains' => []
+			]
+		];
+	}
 
-        $res = TrendingHashtagService::getTrending();
+	public function serverTimeline(Request $request)
+	{
+		abort_if(!$request->user(), 404);
+		abort_if(!$this->config()['server']['enabled'], 404);
+		$pid = $request->user()->profile_id;
+		$domain = $request->input('domain');
+		$config = $this->config();
+		$domains = explode(',', $config['server']['domains']);
+		abort_unless(in_array($domain, $domains), 400);
 
-        return $res;
-    }
+		$res = Status::whereNotNull('uri')
+			->where('uri', 'like', 'https://' . $domain . '%')
+			->whereNull(['in_reply_to_id', 'reblog_of_id'])
+			->orderByDesc('id')
+			->limit(12)
+			->pluck('id')
+			->map(function($id) {
+				return StatusService::get($id);
+			})
+			->filter(function($post) {
+				return $post && isset($post['account']);
+			})
+			->values();
+		return $res;
+	}
 
-    public function trendingPlaces(Request $request)
-    {
-        return [];
-    }
+	public function enabledFeatures(Request $request)
+	{
+		abort_if(!$request->user(), 404);
+		return $this->config();
+	}
 
-    public function myMemories(Request $request)
-    {
-        abort_if(! $request->user(), 404);
-        $pid = $request->user()->profile_id;
-        abort_if(! $this->config()['memories']['enabled'], 404);
-        $type = $request->input('type') ?? 'posts';
-
-        switch ($type) {
-            case 'posts':
-                $res = Status::whereProfileId($pid)
-                    ->whereDay('created_at', date('d'))
-                    ->whereMonth('created_at', date('m'))
-                    ->whereYear('created_at', '!=', date('Y'))
-                    ->whereNull(['reblog_of_id', 'in_reply_to_id'])
-                    ->limit(20)
-                    ->pluck('id')
-                    ->map(function ($id) {
-                        return StatusService::get($id, false);
-                    })
-                    ->filter(function ($post) {
-                        return $post && isset($post['account']);
-                    })
-                    ->values();
-                break;
-
-            case 'liked':
-                $res = Like::whereProfileId($pid)
-                    ->whereDay('created_at', date('d'))
-                    ->whereMonth('created_at', date('m'))
-                    ->whereYear('created_at', '!=', date('Y'))
-                    ->orderByDesc('status_id')
-                    ->limit(20)
-                    ->pluck('status_id')
-                    ->map(function ($id) {
-                        $status = StatusService::get($id, false);
-                        $status['favourited'] = true;
-
-                        return $status;
-                    })
-                    ->filter(function ($post) {
-                        return $post && isset($post['account']);
-                    })
-                    ->values();
-                break;
-        }
-
-        return $res;
-    }
-
-    public function accountInsightsPopularPosts(Request $request)
-    {
-        abort_if(! $request->user(), 404);
-        $pid = $request->user()->profile_id;
-        abort_if(! $this->config()['insights']['enabled'], 404);
-        $posts = Cache::remember('pf:discover:metro2:accinsights:popular:'.$pid, 43200, function () use ($pid) {
-            return Status::whereProfileId($pid)
-                ->whereNotNull('likes_count')
-                ->orderByDesc('likes_count')
-                ->limit(12)
-                ->pluck('id')
-                ->map(function ($id) {
-                    return StatusService::get($id, false);
-                })
-                ->filter(function ($post) {
-                    return $post && isset($post['account']);
-                })
-                ->values();
-        });
-
-        return $posts;
-    }
-
-    public function config()
-    {
-        $cc = ConfigCacheService::get('config.discover.features');
-        if ($cc) {
-            return is_string($cc) ? json_decode($cc, true) : $cc;
-        }
-
-        return [
-            'hashtags' => [
-                'enabled' => false,
-            ],
-            'memories' => [
-                'enabled' => false,
-            ],
-            'insights' => [
-                'enabled' => false,
-            ],
-            'friends' => [
-                'enabled' => false,
-            ],
-            'server' => [
-                'enabled' => false,
-                'mode' => 'allowlist',
-                'domains' => [],
-            ],
-        ];
-    }
-
-    public function serverTimeline(Request $request)
-    {
-        abort_if(! $request->user(), 404);
-        abort_if(! $this->config()['server']['enabled'], 404);
-        $pid = $request->user()->profile_id;
-        $domain = $request->input('domain');
-        $config = $this->config();
-        $domains = explode(',', $config['server']['domains']);
-        abort_unless(in_array($domain, $domains), 400);
-
-        $res = Status::whereNotNull('uri')
-            ->where('uri', 'like', 'https://'.$domain.'%')
-            ->whereNull(['in_reply_to_id', 'reblog_of_id'])
-            ->orderByDesc('id')
-            ->limit(12)
-            ->pluck('id')
-            ->map(function ($id) {
-                return StatusService::get($id);
-            })
-            ->filter(function ($post) {
-                return $post && isset($post['account']);
-            })
-            ->values();
-
-        return $res;
-    }
-
-    public function enabledFeatures(Request $request)
-    {
-        abort_if(! $request->user(), 404);
-
-        return $this->config();
-    }
-
-    public function updateFeatures(Request $request)
-    {
-        abort_if(! $request->user(), 404);
-        abort_if(! $request->user()->is_admin, 404);
-        $pid = $request->user()->profile_id;
-        $this->validate($request, [
-            'features.friends.enabled' => 'boolean',
-            'features.hashtags.enabled' => 'boolean',
-            'features.insights.enabled' => 'boolean',
-            'features.memories.enabled' => 'boolean',
-            'features.server.enabled' => 'boolean',
-        ]);
-        $res = $request->input('features');
-        if ($res['server'] && isset($res['server']['domains']) && ! empty($res['server']['domains'])) {
-            $parts = explode(',', $res['server']['domains']);
-            $parts = array_filter($parts, function ($v) {
-                $len = strlen($v);
-                $pos = strpos($v, '.');
-                $domain = trim($v);
-                if ($pos == false || $pos == ($len + 1)) {
-                    return false;
-                }
-                if (! Instance::whereDomain($domain)->exists()) {
-                    return false;
-                }
-
-                return true;
-            });
-            $parts = array_slice($parts, 0, 10);
-            $d = implode(',', array_map('trim', $parts));
-            $res['server']['domains'] = $d;
-        }
-        ConfigCacheService::put('config.discover.features', json_encode($res));
-
-        return $res;
-    }
-
-    public function discoverAccountsPopular(Request $request)
-    {
-        abort_if(! $request->user(), 403);
-
-        $pid = $request->user()->profile_id;
-
-        $ids = Cache::remember('api:v1.1:discover:accounts:popular', 14400, function () {
-            return DB::table('profiles')
-                ->where('is_private', false)
-                ->whereNull('status')
-                ->orderByDesc('profiles.followers_count')
-                ->limit(30)
-                ->get();
-        });
-        $filters = UserFilterService::filters($pid);
-        $asf = AdminShadowFilterService::getHideFromPublicFeedsList();
-        $ids = $ids->map(function ($profile) {
-            return AccountService::get($profile->id, true);
-        })
-            ->filter(function ($profile) {
-                return $profile && isset($profile['id'], $profile['locked']) && ! $profile['locked'];
-            })
-            ->filter(function ($profile) use ($pid) {
-                return $profile['id'] != $pid;
-            })
-            ->filter(function ($profile) use ($pid) {
-                return ! FollowerService::follows($pid, $profile['id'], true);
-            })
-            ->filter(function ($profile) use ($asf) {
-                return ! in_array($profile['id'], $asf);
-            })
-            ->filter(function ($profile) use ($filters) {
-                return ! in_array($profile['id'], $filters);
-            })
-            ->take(16)
-            ->values();
-
-        return response()->json($ids, 200, [], JSON_UNESCAPED_SLASHES);
-    }
+	public function updateFeatures(Request $request)
+	{
+		abort_if(!$request->user(), 404);
+		abort_if(!$request->user()->is_admin, 404);
+		$pid = $request->user()->profile_id;
+		$this->validate($request, [
+			'features.friends.enabled' => 'boolean',
+			'features.hashtags.enabled' => 'boolean',
+			'features.insights.enabled' => 'boolean',
+			'features.memories.enabled' => 'boolean',
+			'features.server.enabled' => 'boolean',
+		]);
+		$res = $request->input('features');
+		if($res['server'] && isset($res['server']['domains']) && !empty($res['server']['domains'])) {
+			$parts = explode(',', $res['server']['domains']);
+			$parts = array_filter($parts, function($v) {
+				$len = strlen($v);
+				$pos = strpos($v, '.');
+				$domain = trim($v);
+				if($pos == false || $pos == ($len + 1)) {
+					return false;
+				}
+				if(!Instance::whereDomain($domain)->exists()) {
+					return false;
+				}
+				return true;
+			});
+			$parts = array_slice($parts, 0, 10);
+			$d = implode(',', array_map('trim', $parts));
+			$res['server']['domains'] = $d;
+		}
+		ConfigCacheService::put('config.discover.features', json_encode($res));
+		return $res;
+	}
 }

app/Http/Controllers/FederationController.php

@@ -2,269 +2,265 @@
 
 namespace App\Http\Controllers;
 
-use App\Jobs\InboxPipeline\DeleteWorker;
-use App\Jobs\InboxPipeline\InboxValidator;
-use App\Jobs\InboxPipeline\InboxWorker;
-use App\Profile;
-use App\Services\AccountService;
-use App\Services\InstanceService;
-use App\Status;
+use App\Jobs\InboxPipeline\{
+	DeleteWorker,
+	InboxWorker,
+	InboxValidator
+};
+use App\Jobs\RemoteFollowPipeline\RemoteFollowPipeline;
+use App\{
+	AccountLog,
+	Like,
+	Profile,
+	Status,
+	User
+};
 use App\Util\Lexer\Nickname;
-use App\Util\Site\Nodeinfo;
 use App\Util\Webfinger\Webfinger;
+use Auth;
 use Cache;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
+use League\Fractal;
+use App\Util\Site\Nodeinfo;
+use App\Util\ActivityPub\{
+	Helpers,
+	HttpSignature,
+	Outbox
+};
+use Zttp\Zttp;
+use App\Services\InstanceService;
 
 class FederationController extends Controller
 {
-    public function nodeinfoWellKnown()
-    {
-        abort_if(! config('federation.nodeinfo.enabled'), 404);
+	public function nodeinfoWellKnown()
+	{
+		abort_if(!config('federation.nodeinfo.enabled'), 404);
+		return response()->json(Nodeinfo::wellKnown(), 200, [], JSON_UNESCAPED_SLASHES)
+			->header('Access-Control-Allow-Origin','*');
+	}
 
-        return response()->json(Nodeinfo::wellKnown(), 200, [], JSON_UNESCAPED_SLASHES)
-            ->header('Access-Control-Allow-Origin', '*');
-    }
+	public function nodeinfo()
+	{
+		abort_if(!config('federation.nodeinfo.enabled'), 404);
+		return response()->json(Nodeinfo::get(), 200, [], JSON_UNESCAPED_SLASHES)
+			->header('Access-Control-Allow-Origin','*');
+	}
 
-    public function nodeinfo()
-    {
-        abort_if(! config('federation.nodeinfo.enabled'), 404);
+	public function webfinger(Request $request)
+	{
+		if (!config('federation.webfinger.enabled') ||
+			!$request->has('resource') ||
+			!$request->filled('resource')
+		) {
+			return response('', 400);
+		}
 
-        return response()->json(Nodeinfo::get(), 200, [], JSON_UNESCAPED_SLASHES)
-            ->header('Access-Control-Allow-Origin', '*');
-    }
+		$resource = $request->input('resource');
+		$domain = config('pixelfed.domain.app');
 
-    public function webfinger(Request $request)
-    {
-        if (! config('federation.webfinger.enabled') ||
-            ! $request->has('resource') ||
-            ! $request->filled('resource')
-        ) {
-            return response('', 400);
-        }
+		if(config('federation.activitypub.sharedInbox') &&
+			$resource == 'acct:' . $domain . '@' . $domain) {
+			$res = [
+				'subject' => 'acct:' . $domain . '@' . $domain,
+				'aliases' => [
+					'https://' . $domain . '/i/actor'
+				],
+				'links' => [
+					[
+						'rel' => 'http://webfinger.net/rel/profile-page',
+						'type' => 'text/html',
+						'href' => 'https://' . $domain . '/site/kb/instance-actor'
+					],
+					[
+						'rel' => 'self',
+						'type' => 'application/activity+json',
+						'href' => 'https://' . $domain . '/i/actor'
+					]
+				]
+			];
+			return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
+		}
+		$hash = hash('sha256', $resource);
+		$key = 'federation:webfinger:sha256:' . $hash;
+		if($cached = Cache::get($key)) {
+			return response()->json($cached, 200, [], JSON_UNESCAPED_SLASHES);
+		}
+		if(strpos($resource, $domain) == false) {
+			return response('', 400);
+		}
+		$parsed = Nickname::normalizeProfileUrl($resource);
+		if(empty($parsed) || $parsed['domain'] !== $domain) {
+			return response('', 400);
+		}
+		$username = $parsed['username'];
+		$profile = Profile::whereNull('domain')->whereUsername($username)->first();
+		if(!$profile || $profile->status !== null) {
+			return response('', 400);
+		}
+		$webfinger = (new Webfinger($profile))->generate();
+		Cache::put($key, $webfinger, 1209600);
 
-        $resource = $request->input('resource');
-        $domain = config('pixelfed.domain.app');
+		return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
+			->header('Access-Control-Allow-Origin','*');
+	}
 
-        if (config('federation.activitypub.sharedInbox') &&
-            $resource == 'acct:'.$domain.'@'.$domain) {
-            $res = [
-                'subject' => 'acct:'.$domain.'@'.$domain,
-                'aliases' => [
-                    'https://'.$domain.'/i/actor',
-                ],
-                'links' => [
-                    [
-                        'rel' => 'http://webfinger.net/rel/profile-page',
-                        'type' => 'text/html',
-                        'href' => 'https://'.$domain.'/site/kb/instance-actor',
-                    ],
-                    [
-                        'rel' => 'self',
-                        'type' => 'application/activity+json',
-                        'href' => 'https://'.$domain.'/i/actor',
-                    ],
-                ],
-            ];
+	public function hostMeta(Request $request)
+	{
+		abort_if(!config('federation.webfinger.enabled'), 404);
 
-            return response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
-        }
-        $hash = hash('sha256', $resource);
-        $key = 'federation:webfinger:sha256:'.$hash;
-        if ($cached = Cache::get($key)) {
-            return response()->json($cached, 200, [], JSON_UNESCAPED_SLASHES);
-        }
-        if (strpos($resource, $domain) == false) {
-            return response('', 400);
-        }
-        $parsed = Nickname::normalizeProfileUrl($resource);
-        if (empty($parsed) || $parsed['domain'] !== $domain) {
-            return response('', 400);
-        }
-        $username = $parsed['username'];
-        $profile = Profile::whereNull('domain')->whereUsername($username)->first();
-        if (! $profile || $profile->status !== null) {
-            return response('', 400);
-        }
-        $webfinger = (new Webfinger($profile))->generate();
-        Cache::put($key, $webfinger, 1209600);
+		$path = route('well-known.webfinger');
+		$xml = '<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><Link rel="lrdd" type="application/xrd+xml" template="'.$path.'?resource={uri}"/></XRD>';
 
-        return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
-            ->header('Access-Control-Allow-Origin', '*');
-    }
+		return response($xml)->header('Content-Type', 'application/xrd+xml');
+	}
 
-    public function hostMeta(Request $request)
-    {
-        abort_if(! config('federation.webfinger.enabled'), 404);
+	public function userOutbox(Request $request, $username)
+	{
+		abort_if(!config_cache('federation.activitypub.enabled'), 404);
 
-        $path = route('well-known.webfinger');
-        $xml = '<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><Link rel="lrdd" type="application/xrd+xml" template="'.$path.'?resource={uri}"/></XRD>';
+		if(!$request->wantsJson()) {
+			return redirect('/' . $username);
+		}
 
-        return response($xml)->header('Content-Type', 'application/xrd+xml');
-    }
+		$res = [
+			'@context' => 'https://www.w3.org/ns/activitystreams',
+			'id' => 'https://' . config('pixelfed.domain.app') . '/users/' . $username . '/outbox',
+			'type' => 'OrderedCollection',
+			'totalItems' => 0,
+			'orderedItems' => []
+		];
 
-    public function userOutbox(Request $request, $username)
-    {
-        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
+		return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json');
+	}
 
-        if (! $request->wantsJson()) {
-            return redirect('/'.$username);
-        }
+	public function userInbox(Request $request, $username)
+	{
+		abort_if(!config_cache('federation.activitypub.enabled'), 404);
+		abort_if(!config('federation.activitypub.inbox'), 404);
 
-        $id = AccountService::usernameToId($username);
-        abort_if(! $id, 404);
-        $account = AccountService::get($id);
-        abort_if(! $account || ! isset($account['statuses_count']), 404);
-        $res = [
-            '@context' => 'https://www.w3.org/ns/activitystreams',
-            'id' => 'https://'.config('pixelfed.domain.app').'/users/'.$username.'/outbox',
-            'type' => 'OrderedCollection',
-            'totalItems' => $account['statuses_count'] ?? 0,
-        ];
+		$headers = $request->headers->all();
+		$payload = $request->getContent();
+		if(!$payload || empty($payload)) {
+			return;
+		}
+		$obj = json_decode($payload, true, 8);
+		if(!isset($obj['id'])) {
+			return;
+		}
+		$domain = parse_url($obj['id'], PHP_URL_HOST);
+		if(in_array($domain, InstanceService::getBannedDomains())) {
+			return;
+		}
 
-        return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json');
-    }
+		if(isset($obj['type']) && $obj['type'] === 'Delete') {
+			if(isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
+				if($obj['object']['type'] === 'Person') {
+					if(Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
+						dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
+						return;
+					}
+				}
 
-    public function userInbox(Request $request, $username)
-    {
-        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
-        abort_if(! config('federation.activitypub.inbox'), 404);
+				if($obj['object']['type'] === 'Tombstone') {
+					if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
+						dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
+						return;
+					}
+				}
 
-        $headers = $request->headers->all();
-        $payload = $request->getContent();
-        if (! $payload || empty($payload)) {
-            return;
-        }
-        $obj = json_decode($payload, true, 8);
-        if (! isset($obj['id'])) {
-            return;
-        }
-        $domain = parse_url($obj['id'], PHP_URL_HOST);
-        if (in_array($domain, InstanceService::getBannedDomains())) {
-            return;
-        }
+				if($obj['object']['type'] === 'Story') {
+					dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
+					return;
+				}
+			}
+			return;
+		} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
+			dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow');
+		} else {
+			dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high');
+		}
+		return;
+	}
 
-        if (isset($obj['type']) && $obj['type'] === 'Delete') {
-            if (isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
-                if ($obj['object']['type'] === 'Person') {
-                    if (Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
-                        dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
+	public function sharedInbox(Request $request)
+	{
+		abort_if(!config_cache('federation.activitypub.enabled'), 404);
+		abort_if(!config('federation.activitypub.sharedInbox'), 404);
 
-                        return;
-                    }
-                }
+		$headers = $request->headers->all();
+		$payload = $request->getContent();
 
-                if ($obj['object']['type'] === 'Tombstone') {
-                    if (Status::whereObjectUrl($obj['object']['id'])->exists()) {
-                        dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
+		if(!$payload || empty($payload)) {
+			return;
+		}
 
-                        return;
-                    }
-                }
+		$obj = json_decode($payload, true, 8);
+		if(!isset($obj['id'])) {
+			return;
+		}
 
-                if ($obj['object']['type'] === 'Story') {
-                    dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
+		$domain = parse_url($obj['id'], PHP_URL_HOST);
+		if(in_array($domain, InstanceService::getBannedDomains())) {
+			return;
+		}
 
-                    return;
-                }
-            }
+		if(isset($obj['type']) && $obj['type'] === 'Delete') {
+			if(isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
+				if($obj['object']['type'] === 'Person') {
+					if(Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
+						dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
+						return;
+					}
+				}
 
-            return;
-        } elseif (isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
-            dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow');
-        } else {
-            dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high');
-        }
+				if($obj['object']['type'] === 'Tombstone') {
+					if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
+						dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
+						return;
+					}
+				}
 
-    }
+				if($obj['object']['type'] === 'Story') {
+					dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
+					return;
+				}
+			}
+			return;
+		} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
+			dispatch(new InboxWorker($headers, $payload))->onQueue('follow');
+		} else {
+			dispatch(new InboxWorker($headers, $payload))->onQueue('shared');
+		}
+		return;
+	}
 
-    public function sharedInbox(Request $request)
-    {
-        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
-        abort_if(! config('federation.activitypub.sharedInbox'), 404);
+	public function userFollowing(Request $request, $username)
+	{
+		abort_if(!config_cache('federation.activitypub.enabled'), 404);
 
-        $headers = $request->headers->all();
-        $payload = $request->getContent();
+		$obj = [
+			'@context' => 'https://www.w3.org/ns/activitystreams',
+			'id'       => $request->getUri(),
+			'type'     => 'OrderedCollectionPage',
+			'totalItems' => 0,
+			'orderedItems' => []
+		];
+		return response()->json($obj);
+	}
 
-        if (! $payload || empty($payload)) {
-            return;
-        }
+	public function userFollowers(Request $request, $username)
+	{
+		abort_if(!config_cache('federation.activitypub.enabled'), 404);
 
-        $obj = json_decode($payload, true, 8);
-        if (! isset($obj['id'])) {
-            return;
-        }
+		$obj = [
+			'@context' => 'https://www.w3.org/ns/activitystreams',
+			'id'       => $request->getUri(),
+			'type'     => 'OrderedCollectionPage',
+			'totalItems' => 0,
+			'orderedItems' => []
+		];
 
-        $domain = parse_url($obj['id'], PHP_URL_HOST);
-        if (in_array($domain, InstanceService::getBannedDomains())) {
-            return;
-        }
-
-        if (isset($obj['type']) && $obj['type'] === 'Delete') {
-            if (isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
-                if ($obj['object']['type'] === 'Person') {
-                    if (Profile::whereRemoteUrl($obj['object']['id'])->exists()) {
-                        dispatch(new DeleteWorker($headers, $payload))->onQueue('inbox');
-
-                        return;
-                    }
-                }
-
-                if ($obj['object']['type'] === 'Tombstone') {
-                    if (Status::whereObjectUrl($obj['object']['id'])->exists()) {
-                        dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
-
-                        return;
-                    }
-                }
-
-                if ($obj['object']['type'] === 'Story') {
-                    dispatch(new DeleteWorker($headers, $payload))->onQueue('story');
-
-                    return;
-                }
-            }
-
-            return;
-        } elseif (isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
-            dispatch(new InboxWorker($headers, $payload))->onQueue('follow');
-        } else {
-            dispatch(new InboxWorker($headers, $payload))->onQueue('shared');
-        }
-
-    }
-
-    public function userFollowing(Request $request, $username)
-    {
-        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
-
-        $id = AccountService::usernameToId($username);
-        abort_if(! $id, 404);
-        $account = AccountService::get($id);
-        abort_if(! $account || ! isset($account['following_count']), 404);
-        $obj = [
-            '@context' => 'https://www.w3.org/ns/activitystreams',
-            'id' => $request->getUri(),
-            'type' => 'OrderedCollection',
-            'totalItems' => $account['following_count'] ?? 0,
-        ];
-
-        return response()->json($obj)->header('Content-Type', 'application/activity+json');
-    }
-
-    public function userFollowers(Request $request, $username)
-    {
-        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
-        $id = AccountService::usernameToId($username);
-        abort_if(! $id, 404);
-        $account = AccountService::get($id);
-        abort_if(! $account || ! isset($account['followers_count']), 404);
-        $obj = [
-            '@context' => 'https://www.w3.org/ns/activitystreams',
-            'id' => $request->getUri(),
-            'type' => 'OrderedCollection',
-            'totalItems' => $account['followers_count'] ?? 0,
-        ];
-
-        return response()->json($obj)->header('Content-Type', 'application/activity+json');
-    }
+		return response()->json($obj);
+	}
 }

app/Http/Controllers/HealthCheckController.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class HealthCheckController extends Controller
-{
-    public function get(Request $request)
-    {
-        return response('OK')->withHeaders([
-            'Content-Type' => 'text/plain',
-            'Cache-Control' => 'max-age=0, must-revalidate, no-cache, no-store'
-        ]);
-    }
-}

app/Http/Controllers/Import/Instagram.php

@@ -17,7 +17,7 @@ trait Instagram
 {
 	public function instagram()
 	{
-		if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
+		if(config_cache('pixelfed.import.instagram.enabled') != true) {
 			abort(404, 'Feature not enabled');
 		}
 		return view('settings.import.instagram.home');
@@ -25,9 +25,6 @@ trait Instagram
 
     public function instagramStart(Request $request)
     {	
-        if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
-            abort(404, 'Feature not enabled');
-        }
         $completed = ImportJob::whereProfileId(Auth::user()->profile->id)
             ->whereService('instagram')
             ->whereNotNull('completed_at')
@@ -41,9 +38,6 @@ trait Instagram
 
     protected function instagramRedirectOrNew()
     {
-        if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
-            abort(404, 'Feature not enabled');
-        }
     	$profile = Auth::user()->profile;
     	$exists = ImportJob::whereProfileId($profile->id)
     		->whereService('instagram')
@@ -67,9 +61,6 @@ trait Instagram
 
     public function instagramStepOne(Request $request, $uuid)
     {
-        if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
-            abort(404, 'Feature not enabled');
-        }
     	$profile = Auth::user()->profile;
     	$job = ImportJob::whereProfileId($profile->id)
     		->whereNull('completed_at')
@@ -81,9 +72,6 @@ trait Instagram
 
     public function instagramStepOneStore(Request $request, $uuid)
     {
-        if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
-            abort(404, 'Feature not enabled');
-        }
         $max = 'max:' . config('pixelfed.import.instagram.limits.size');
     	$this->validate($request, [
     		'media.*' => 'required|mimes:bin,jpeg,png,gif|'.$max,
@@ -126,9 +114,6 @@ trait Instagram
 
     public function instagramStepTwo(Request $request, $uuid)
     {
-        if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
-            abort(404, 'Feature not enabled');
-        }
     	$profile = Auth::user()->profile;
     	$job = ImportJob::whereProfileId($profile->id)
     		->whereNull('completed_at')
@@ -140,9 +125,6 @@ trait Instagram
 
     public function instagramStepTwoStore(Request $request, $uuid)
     {
-        if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
-            abort(404, 'Feature not enabled');
-        }
     	$this->validate($request, [
     		'media' => 'required|file|max:1000'
     	]);
@@ -168,9 +150,6 @@ trait Instagram
 
     public function instagramStepThree(Request $request, $uuid)
     {
-        if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
-            abort(404, 'Feature not enabled');
-        }
     	$profile = Auth::user()->profile;
     	$job = ImportJob::whereProfileId($profile->id)
             ->whereService('instagram')
@@ -183,9 +162,6 @@ trait Instagram
 
     public function instagramStepThreeStore(Request $request, $uuid)
     {
-        if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
-            abort(404, 'Feature not enabled');
-        }
         $profile = Auth::user()->profile;
 
         try {

app/Http/Controllers/ImportPostController.php

@@ -83,17 +83,6 @@ class ImportPostController extends Controller
         );
     }
 
-    public function formatHashtags($val = false)
-    {
-        if(!$val || !strlen($val)) {
-            return null;
-        }
-
-        $groupedHashtagRegex = '/#\w+(?=#)/';
-
-        return preg_replace($groupedHashtagRegex, '$0 ', $val);
-    }
-
     public function store(Request $request)
     {
         abort_unless(config('import.instagram.enabled'), 404);
@@ -139,11 +128,11 @@ class ImportPostController extends Controller
             $ip->media = $c->map(function($m) {
                 return [
                     'uri' => $m['uri'],
-                    'title' => $this->formatHashtags($m['title']),
+                    'title' => $m['title'],
                     'creation_timestamp' => $m['creation_timestamp']
                 ];
             })->toArray();
-            $ip->caption = $c->count() > 1 ? $this->formatHashtags($file['title']) : $this->formatHashtags($ip->media[0]['title']);
+            $ip->caption = $c->count() > 1 ? $file['title'] : $ip->media[0]['title'];
             $ip->filename = last(explode('/', $ip->media[0]['uri']));
             $ip->metadata = $c->map(function($m) {
                 return [
@@ -179,7 +168,7 @@ class ImportPostController extends Controller
                 'required',
                 'file',
                 $mimes,
-                'max:' . config_cache('pixelfed.max_photo_size')
+                'max:' . config('pixelfed.max_photo_size')
             ]
         ]);
 

app/Http/Controllers/LandingController.php

@@ -2,43 +2,44 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Resources\DirectoryProfile;
-use App\Profile;
 use Illuminate\Http\Request;
+use App\Profile;
+use App\Services\AccountService;
+use App\Http\Resources\DirectoryProfile;
 
 class LandingController extends Controller
 {
     public function directoryRedirect(Request $request)
     {
-        if ($request->user()) {
-            return redirect('/');
-        }
+    	if($request->user()) {
+    		return redirect('/');
+    	}
 
-        abort_if((bool) config_cache('instance.landing.show_directory') == false, 404);
+    	abort_if(config_cache('instance.landing.show_directory') == false, 404);
 
-        return view('site.index');
+    	return view('site.index');
     }
 
     public function exploreRedirect(Request $request)
     {
-        if ($request->user()) {
-            return redirect('/');
-        }
+    	if($request->user()) {
+    		return redirect('/');
+    	}
 
-        abort_if((bool) config_cache('instance.landing.show_explore') == false, 404);
+    	abort_if(config_cache('instance.landing.show_explore') == false, 404);
 
-        return view('site.index');
+    	return view('site.index');
     }
 
     public function getDirectoryApi(Request $request)
     {
-        abort_if((bool) config_cache('instance.landing.show_directory') == false, 404);
+    	abort_if(config_cache('instance.landing.show_directory') == false, 404);
 
-        return DirectoryProfile::collection(
-            Profile::whereNull('domain')
-                ->whereIsSuggestable(true)
-                ->orderByDesc('updated_at')
-                ->cursorPaginate(20)
-        );
+    	return DirectoryProfile::collection(
+    		Profile::whereNull('domain')
+    		->whereIsSuggestable(true)
+    		->orderByDesc('updated_at')
+    		->cursorPaginate(20)
+    	);
     }
 }

app/Http/Controllers/LikeController.php

@@ -25,7 +25,8 @@ class LikeController extends Controller
 			'item'    => 'required|integer|min:1',
 		]);
 
-		abort(422, 'Deprecated API Endpoint');
+		// API deprecated
+		return;
 
 		$user = Auth::user();
 		$profile = $user->profile;
@@ -33,7 +34,7 @@ class LikeController extends Controller
 
 		if (Like::whereStatusId($status->id)->whereProfileId($profile->id)->exists()) {
 			$like = Like::whereProfileId($profile->id)->whereStatusId($status->id)->firstOrFail();
-			UnlikePipeline::dispatch($like)->onQueue('feed');
+			UnlikePipeline::dispatch($like);
 		} else {
 			abort_if(
 				Like::whereProfileId($user->profile_id)
@@ -59,7 +60,7 @@ class LikeController extends Controller
 					]) == false;
 				$like->save();
 				$status->save();
-				LikePipeline::dispatch($like)->onQueue('feed');
+				LikePipeline::dispatch($like);
 			}
 		}
 

app/Http/Controllers/MediaController.php

@@ -2,31 +2,30 @@
 
 namespace App\Http\Controllers;
 
-use App\Media;
 use Illuminate\Http\Request;
+use App\Media;
 
 class MediaController extends Controller
 {
-    public function index(Request $request)
-    {
-        //return view('settings.drive.index');
-        abort(404);
-    }
+	public function index(Request $request)
+	{
+		//return view('settings.drive.index');
+	}
 
-    public function composeUpdate(Request $request, $id)
-    {
+	public function composeUpdate(Request $request, $id)
+	{
         abort(400, 'Endpoint deprecated');
-    }
+	}	
 
-    public function fallbackRedirect(Request $request, $pid, $mhash, $uhash, $f)
-    {
-        abort_if(! (bool) config_cache('pixelfed.cloud_storage'), 404);
-        $path = 'public/m/_v2/'.$pid.'/'.$mhash.'/'.$uhash.'/'.$f;
-        $media = Media::whereProfileId($pid)
-            ->whereMediaPath($path)
-            ->whereNotNull('cdn_url')
-            ->firstOrFail();
+	public function fallbackRedirect(Request $request, $pid, $mhash, $uhash, $f)
+	{
+		abort_if(!config_cache('pixelfed.cloud_storage'), 404);
+		$path = 'public/m/_v2/' . $pid . '/' . $mhash . '/' . $uhash . '/' . $f;
+		$media = Media::whereProfileId($pid)
+			->whereMediaPath($path)
+			->whereNotNull('cdn_url')
+			->firstOrFail();
 
-        return redirect()->away($media->cdn_url);
-    }
+		return redirect()->away($media->cdn_url);
+	}
 }

app/Http/Controllers/ParentalControlsController.php

@@ -1,231 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Models\ParentalControls;
-use App\Models\UserRoles;
-use App\Profile;
-use App\User;
-use App\Http\Controllers\Auth\RegisterController;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Support\Facades\Auth;
-use App\Services\UserRoleService;
-use App\Jobs\ParentalControlsPipeline\DispatchChildInvitePipeline;
-
-class ParentalControlsController extends Controller
-{
-    public function authPreflight($request, $maxUserCheck = false, $authCheck = true)
-    {
-        if($authCheck) {
-            abort_unless($request->user(), 404);
-            abort_unless($request->user()->has_roles === 0, 404);
-        }
-        abort_unless(config('instance.parental_controls.enabled'), 404);
-        if(config_cache('pixelfed.open_registration') == false) {
-            abort_if(config('instance.parental_controls.limits.respect_open_registration'), 404);
-        }
-        if($maxUserCheck == true) {
-            $hasLimit = config('pixelfed.enforce_max_users');
-            if($hasLimit) {
-                $count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count();
-                $limit = (int) config('pixelfed.max_users');
-
-                abort_if($limit && $limit <= $count, 404);
-            }
-        }
-    }
-
-    public function index(Request $request)
-    {
-        $this->authPreflight($request);
-        $children = ParentalControls::whereParentId($request->user()->id)->latest()->paginate(5);
-        return view('settings.parental-controls.index', compact('children'));
-    }
-
-    public function add(Request $request)
-    {
-        $this->authPreflight($request, true);
-        return view('settings.parental-controls.add');
-    }
-
-    public function view(Request $request, $id)
-    {
-        $this->authPreflight($request);
-        $uid = $request->user()->id;
-        $pc = ParentalControls::whereParentId($uid)->findOrFail($id);
-        return view('settings.parental-controls.manage', compact('pc'));
-    }
-
-    public function update(Request $request, $id)
-    {
-        $this->authPreflight($request);
-        $uid = $request->user()->id;
-        $ff = $this->requestFormFields($request);
-        $pc = ParentalControls::whereParentId($uid)->findOrFail($id);
-        $pc->permissions = $ff;
-        $pc->save();
-
-        $roles = UserRoleService::mapActions($pc->child_id, $ff);
-        if(isset($roles['account-force-private'])) {
-            $c = Profile::whereUserId($pc->child_id)->first();
-            $c->is_private = $roles['account-force-private'];
-            $c->save();
-        }
-        UserRoles::whereUserId($pc->child_id)->update(['roles' => $roles]);
-        return redirect($pc->manageUrl() . '?permissions');
-    }
-
-    public function store(Request $request)
-    {
-        $this->authPreflight($request, true);
-        $this->validate($request, [
-            'email' => 'required|email|unique:parental_controls,email|unique:users,email',
-        ]);
-
-        $state = $this->requestFormFields($request);
-
-        $pc = new ParentalControls;
-        $pc->parent_id = $request->user()->id;
-        $pc->email = $request->input('email');
-        $pc->verify_code = str_random(32);
-        $pc->permissions = $state;
-        $pc->save();
-
-        DispatchChildInvitePipeline::dispatch($pc);
-        return redirect($pc->manageUrl());
-    }
-
-    public function inviteRegister(Request $request, $id, $code)
-    {
-        if($request->user()) {
-            $title = 'You cannot complete this action on this device.';
-            $body = 'Please log out or use a different device or browser to complete the invitation registration.';
-            return view('errors.custom', compact('title', 'body'));
-        }
-
-        $this->authPreflight($request, true, false);
-
-        $pc = ParentalControls::whereRaw('verify_code = BINARY ?', $code)->whereNull(['email_verified_at', 'child_id'])->findOrFail($id);
-        abort_unless(User::whereId($pc->parent_id)->exists(), 404);
-        return view('settings.parental-controls.invite-register-form', compact('pc'));
-    }
-
-    public function inviteRegisterStore(Request $request, $id, $code)
-    {
-        if($request->user()) {
-            $title = 'You cannot complete this action on this device.';
-            $body = 'Please log out or use a different device or browser to complete the invitation registration.';
-            return view('errors.custom', compact('title', 'body'));
-        }
-
-        $this->authPreflight($request, true, false);
-
-        $pc = ParentalControls::whereRaw('verify_code = BINARY ?', $code)->whereNull('email_verified_at')->findOrFail($id);
-
-        $fields = $request->all();
-        $fields['email'] = $pc->email;
-        $defaults = UserRoleService::defaultRoles();
-        $validator = (new RegisterController)->validator($fields);
-        $valid = $validator->validate();
-        abort_if(!$valid, 404);
-        event(new Registered($user = (new RegisterController)->create($fields)));
-        sleep(5);
-        $user->has_roles = true;
-        $user->parent_id = $pc->parent_id;
-        if(config('instance.parental_controls.limits.auto_verify_email')) {
-            $user->email_verified_at = now();
-            $user->save();
-            sleep(3);
-        } else {
-            $user->save();
-            sleep(3);
-        }
-        $ur = UserRoles::updateOrCreate([
-            'user_id' => $user->id,
-        ],[
-            'roles' => UserRoleService::mapInvite($user->id, $pc->permissions)
-        ]);
-        $pc->email_verified_at = now();
-        $pc->child_id = $user->id;
-        $pc->save();
-        sleep(2);
-        Auth::guard()->login($user);
-
-        return redirect('/i/web');
-    }
-
-    public function cancelInvite(Request $request, $id)
-    {
-        $this->authPreflight($request);
-        $pc = ParentalControls::whereParentId($request->user()->id)
-            ->whereNull(['email_verified_at', 'child_id'])
-            ->findOrFail($id);
-
-        return view('settings.parental-controls.delete-invite', compact('pc'));
-    }
-
-    public function cancelInviteHandle(Request $request, $id)
-    {
-        $this->authPreflight($request);
-        $pc = ParentalControls::whereParentId($request->user()->id)
-            ->whereNull(['email_verified_at', 'child_id'])
-            ->findOrFail($id);
-
-        $pc->delete();
-
-        return redirect('/settings/parental-controls');
-    }
-
-    public function stopManaging(Request $request, $id)
-    {
-        $this->authPreflight($request);
-        $pc = ParentalControls::whereParentId($request->user()->id)
-            ->whereNotNull(['email_verified_at', 'child_id'])
-            ->findOrFail($id);
-
-        return view('settings.parental-controls.stop-managing', compact('pc'));
-    }
-
-    public function stopManagingHandle(Request $request, $id)
-    {
-        $this->authPreflight($request);
-        $pc = ParentalControls::whereParentId($request->user()->id)
-            ->whereNotNull(['email_verified_at', 'child_id'])
-            ->findOrFail($id);
-        $pc->child()->update([
-            'has_roles' => false,
-            'parent_id' => null,
-        ]);
-        $pc->delete();
-
-        return redirect('/settings/parental-controls');
-    }
-
-    protected function requestFormFields($request)
-    {
-        $state = [];
-        $fields = [
-            'post',
-            'comment',
-            'like',
-            'share',
-            'follow',
-            'bookmark',
-            'story',
-            'collection',
-            'discovery_feeds',
-            'dms',
-            'federation',
-            'hide_network',
-            'private',
-            'hide_cw'
-        ];
-
-        foreach ($fields as $field) {
-            $state[$field] = $request->input($field) == 'on';
-        }
-
-        return $state;
-    }
-}

app/Http/Controllers/PixelfedDirectoryController.php

@@ -2,41 +2,37 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Http\Request;
 use App\Models\ConfigCache;
+use Storage;
 use App\Services\AccountService;
 use App\Services\StatusService;
-use Illuminate\Http\Request;
 use Illuminate\Support\Str;
-use Cache;
-use Storage;
-use App\Status;
-use App\User;
 
 class PixelfedDirectoryController extends Controller
 {
     public function get(Request $request)
     {
-        if (! $request->filled('sk')) {
+        if(!$request->filled('sk')) {
             abort(404);
         }
 
-        if (! config_cache('pixelfed.directory.submission-key')) {
+        if(!config_cache('pixelfed.directory.submission-key')) {
             abort(404);
         }
 
-        if (! hash_equals(config_cache('pixelfed.directory.submission-key'), $request->input('sk'))) {
+        if(!hash_equals(config_cache('pixelfed.directory.submission-key'), $request->input('sk'))) {
             abort(403);
         }
 
         $res = $this->buildListing();
-
-        return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
     }
 
     public function buildListing()
     {
         $res = config_cache('pixelfed.directory');
-        if ($res) {
+        if($res) {
             $res = is_string($res) ? json_decode($res, true) : $res;
         }
 
@@ -45,71 +41,70 @@ class PixelfedDirectoryController extends Controller
         $res['_ts'] = config_cache('pixelfed.directory.submission-ts');
         $res['version'] = config_cache('pixelfed.version');
 
-        if (empty($res['summary'])) {
+        if(empty($res['summary'])) {
             $summary = ConfigCache::whereK('app.short_description')->pluck('v');
             $res['summary'] = $summary ? $summary[0] : null;
         }
 
-        if (isset($res['admin'])) {
+        if(isset($res['admin'])) {
             $res['admin'] = AccountService::get($res['admin'], true);
         }
 
-        if (isset($res['banner_image']) && ! empty($res['banner_image'])) {
+        if(isset($res['banner_image']) && !empty($res['banner_image'])) {
             $res['banner_image'] = url(Storage::url($res['banner_image']));
         }
 
-        if (isset($res['favourite_posts'])) {
-            $res['favourite_posts'] = collect($res['favourite_posts'])->map(function ($id) {
+        if(isset($res['favourite_posts'])) {
+            $res['favourite_posts'] = collect($res['favourite_posts'])->map(function($id) {
                 return StatusService::get($id);
             })
-                ->filter(function ($post) {
-                    return $post && isset($post['account']);
-                })
-                ->map(function ($post) {
-                    return [
-                        'avatar' => $post['account']['avatar'],
-                        'display_name' => $post['account']['display_name'],
-                        'username' => $post['account']['username'],
-                        'media' => $post['media_attachments'][0]['url'],
-                        'url' => $post['url'],
-                    ];
-                })
-                ->values();
+            ->filter(function($post) {
+                return $post && isset($post['account']);
+            })
+            ->map(function($post) {
+                return [
+                    'avatar' => $post['account']['avatar'],
+                    'display_name' => $post['account']['display_name'],
+                    'username' => $post['account']['username'],
+                    'media' => $post['media_attachments'][0]['url'],
+                    'url' => $post['url']
+                ];
+            })
+            ->values();
         }
 
         $guidelines = ConfigCache::whereK('app.rules')->first();
-        if ($guidelines) {
+        if($guidelines) {
             $res['community_guidelines'] = json_decode($guidelines->v, true);
         }
 
-        $openRegistration = (bool) config_cache('pixelfed.open_registration');
-        $res['open_registration'] = $openRegistration;
-
-        $curatedOnboarding = (bool) config_cache('instance.curated_registration.enabled');
-        $res['curated_onboarding'] = $curatedOnboarding;
+        $openRegistration = ConfigCache::whereK('pixelfed.open_registration')->first();
+        if($openRegistration) {
+            $res['open_registration'] = (bool) $openRegistration;
+        }
 
         $oauthEnabled = ConfigCache::whereK('pixelfed.oauth_enabled')->first();
-        if ($oauthEnabled) {
+        if($oauthEnabled) {
             $keys = file_exists(storage_path('oauth-public.key')) && file_exists(storage_path('oauth-private.key'));
             $res['oauth_enabled'] = (bool) $oauthEnabled && $keys;
         }
 
         $activityPubEnabled = ConfigCache::whereK('federation.activitypub.enabled')->first();
-        if ($activityPubEnabled) {
+        if($activityPubEnabled) {
             $res['activitypub_enabled'] = (bool) $activityPubEnabled;
         }
 
         $res['feature_config'] = [
             'media_types' => Str::of(config_cache('pixelfed.media_types'))->explode(','),
             'image_quality' => config_cache('pixelfed.image_quality'),
-            'optimize_image' => (bool) config_cache('pixelfed.optimize_image'),
+            'optimize_image' => config_cache('pixelfed.optimize_image'),
             'max_photo_size' => config_cache('pixelfed.max_photo_size'),
             'max_caption_length' => config_cache('pixelfed.max_caption_length'),
             'max_altext_length' => config_cache('pixelfed.max_altext_length'),
-            'enforce_account_limit' => (bool) config_cache('pixelfed.enforce_account_limit'),
+            'enforce_account_limit' => config_cache('pixelfed.enforce_account_limit'),
             'max_account_size' => config_cache('pixelfed.max_account_size'),
             'max_album_length' => config_cache('pixelfed.max_album_length'),
-            'account_deletion' => (bool) config_cache('pixelfed.account_deletion'),
+            'account_deletion' => config_cache('pixelfed.account_deletion'),
         ];
 
         $res['is_eligible'] = $this->validVal($res, 'admin') &&
@@ -119,36 +114,29 @@ class PixelfedDirectoryController extends Controller
             $this->validVal($res, 'privacy_pledge') &&
             $this->validVal($res, 'location');
 
-        if (config_cache('pixelfed.directory.testimonials')) {
+        if(config_cache('pixelfed.directory.testimonials')) {
             $res['testimonials'] = collect(json_decode(config_cache('pixelfed.directory.testimonials'), true))
-                ->map(function ($testimonial) {
+                ->map(function($testimonial) {
                     $profile = AccountService::get($testimonial['profile_id']);
-
                     return [
                         'profile' => [
                             'username' => $profile['username'],
                             'display_name' => $profile['display_name'],
                             'avatar' => $profile['avatar'],
-                            'created_at' => $profile['created_at'],
+                            'created_at' => $profile['created_at']
                         ],
-                        'body' => $testimonial['body'],
+                        'body' => $testimonial['body']
                     ];
                 });
         }
 
         $res['features_enabled'] = [
-            'stories' => (bool) config_cache('instance.stories.enabled'),
+            'stories' => (bool) config_cache('instance.stories.enabled')
         ];
 
-        $statusesCount = Cache::remember('api:nodeinfo:statuses', 21600, function() {
-            return Status::whereLocal(true)->count();
-        });
-        $usersCount = Cache::remember('api:nodeinfo:users', 43200, function() {
-            return User::count();
-        });
         $res['stats'] = [
-            'user_count' => (int) $usersCount,
-            'post_count' => (int) $statusesCount,
+            'user_count' => \App\User::count(),
+            'post_count' => \App\Status::whereNull('uri')->count(),
         ];
 
         $res['primary_locale'] = config('app.locale');
@@ -161,18 +149,19 @@ class PixelfedDirectoryController extends Controller
 
     protected function validVal($res, $val, $count = false, $minLen = false)
     {
-        if (! isset($res[$val])) {
+        if(!isset($res[$val])) {
             return false;
         }
 
-        if ($count) {
+        if($count) {
             return count($res[$val]) >= $count;
         }
 
-        if ($minLen) {
+        if($minLen) {
             return strlen($res[$val]) >= $minLen;
         }
 
         return $res[$val];
     }
+
 }

app/Http/Controllers/ProfileAliasController.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Models\ProfileAlias;
-use App\Models\ProfileMigration;
-use App\Services\AccountService;
-use App\Services\WebfingerService;
-use App\Util\Lexer\Nickname;
-use Cache;
-use Illuminate\Http\Request;
-
-class ProfileAliasController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-
-    public function index(Request $request)
-    {
-        $aliases = $request->user()->profile->aliases;
-
-        return view('settings.aliases.index', compact('aliases'));
-    }
-
-    public function store(Request $request)
-    {
-        $this->validate($request, [
-            'acct' => 'required',
-        ]);
-
-        $acct = $request->input('acct');
-
-        $nn = Nickname::normalizeProfileUrl($acct);
-        if (! $nn) {
-            return back()->with('error', 'Invalid account alias.');
-        }
-
-        if ($nn['domain'] === config('pixelfed.domain.app')) {
-            if (strtolower($nn['username']) == ($request->user()->username)) {
-                return back()->with('error', 'You cannot add an alias to your own account.');
-            }
-        }
-
-        if ($request->user()->profile->aliases->count() >= 3) {
-            return back()->with('error', 'You can only add 3 account aliases.');
-        }
-
-        $webfingerService = WebfingerService::lookup($acct);
-        $webfingerUrl = WebfingerService::rawGet($acct);
-
-        if (! $webfingerService || ! isset($webfingerService['url']) || ! $webfingerUrl || empty($webfingerUrl)) {
-            return back()->with('error', 'Invalid account, cannot add alias at this time.');
-        }
-        $alias = new ProfileAlias;
-        $alias->profile_id = $request->user()->profile_id;
-        $alias->acct = $acct;
-        $alias->uri = $webfingerUrl;
-        $alias->save();
-
-        Cache::forget('pf:activitypub:user-object:by-id:'.$request->user()->profile_id);
-
-        return back()->with('status', 'Successfully added alias!');
-    }
-
-    public function delete(Request $request)
-    {
-        $this->validate($request, [
-            'acct' => 'required',
-            'id' => 'required|exists:profile_aliases',
-        ]);
-        $pid = $request->user()->profile_id;
-        $acct = $request->input('acct');
-        $alias = ProfileAlias::where('profile_id', $pid)
-            ->where('acct', $acct)
-            ->findOrFail($request->input('id'));
-        $migration = ProfileMigration::whereProfileId($pid)
-            ->whereAcct($acct)
-            ->first();
-        if ($migration) {
-            $request->user()->profile->update([
-                'moved_to_profile_id' => null,
-            ]);
-        }
-
-        $alias->delete();
-        Cache::forget('pf:activitypub:user-object:by-id:'.$pid);
-        AccountService::del($pid);
-
-        return back()->with('status', 'Successfully deleted alias!');
-    }
-}

app/Http/Controllers/ProfileController.php

@@ -2,387 +2,356 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Http\Request;
+use Auth;
+use Cache;
+use DB;
+use View;
 use App\AccountInterstitial;
 use App\Follower;
 use App\FollowRequest;
 use App\Profile;
+use App\Story;
+use App\User;
+use App\UserSetting;
+use App\UserFilter;
+use League\Fractal;
 use App\Services\AccountService;
 use App\Services\FollowerService;
 use App\Services\StatusService;
-use App\Status;
-use App\Story;
+use App\Util\Lexer\Nickname;
+use App\Util\Webfinger\Webfinger;
+use App\Transformer\ActivityPub\ProfileOutbox;
 use App\Transformer\ActivityPub\ProfileTransformer;
-use App\User;
-use App\UserFilter;
-use App\UserSetting;
-use Auth;
-use Cache;
-use Illuminate\Http\Request;
-use League\Fractal;
-use View;
 
 class ProfileController extends Controller
 {
-    public function show(Request $request, $username)
-    {
-        if ($request->wantsJson() && (bool) config_cache('federation.activitypub.enabled')) {
-            $user = $this->getCachedUser($username, true);
-            abort_if(! $user, 404, 'Not found');
-
-            return $this->showActivityPub($request, $user);
-        }
-
-        // redirect authed users to Metro 2.0
-        if ($request->user()) {
-            // unless they force static view
-            if (! $request->has('fs') || $request->input('fs') != '1') {
-                $pid = AccountService::usernameToId($username);
-                if ($pid) {
-                    return redirect('/i/web/profile/'.$pid);
-                }
-            }
-        }
-
-        $user = $this->getCachedUser($username);
-
-        abort_unless($user, 404);
-
-        $aiCheck = Cache::remember('profile:ai-check:spam-login:'.$user->id, 3600, function () use ($user) {
-            $exists = AccountInterstitial::whereUserId($user->user_id)->where('is_spam', 1)->count();
-            if ($exists) {
-                return true;
-            }
-
-            return false;
-        });
-        if ($aiCheck) {
-            return redirect('/login');
-        }
-
-        return $this->buildProfile($request, $user);
-    }
-
-    protected function buildProfile(Request $request, $user)
-    {
-        $username = $user->username;
-        $loggedIn = Auth::check();
-        $isPrivate = false;
-        $isBlocked = false;
-        if (! $loggedIn) {
-            $key = 'profile:settings:'.$user->id;
-            $ttl = now()->addHours(6);
-            $settings = Cache::remember($key, $ttl, function () use ($user) {
-                return $user->user->settings;
-            });
-
-            if ($user->is_private == true) {
-                $profile = null;
-
-                return view('profile.private', compact('user'));
-            }
-
-            $owner = false;
-            $is_following = false;
-
-            $profile = $user;
-            $settings = [
-                'crawlable' => $settings->crawlable,
-                'following' => [
-                    'count' => $settings->show_profile_following_count,
-                    'list' => $settings->show_profile_following,
-                ],
-                'followers' => [
-                    'count' => $settings->show_profile_follower_count,
-                    'list' => $settings->show_profile_followers,
-                ],
-            ];
-
-            return view('profile.show', compact('profile', 'settings'));
-        } else {
-            $key = 'profile:settings:'.$user->id;
-            $ttl = now()->addHours(6);
-            $settings = Cache::remember($key, $ttl, function () use ($user) {
-                return $user->user->settings;
-            });
-
-            if ($user->is_private == true) {
-                $isPrivate = $this->privateProfileCheck($user, $loggedIn);
-            }
-
-            $isBlocked = $this->blockedProfileCheck($user);
-
-            $owner = $loggedIn && Auth::id() === $user->user_id;
-            $is_following = ($owner == false && Auth::check()) ? $user->followedBy(Auth::user()->profile) : false;
-
-            if ($isPrivate == true || $isBlocked == true) {
-                $requested = Auth::check() ? FollowRequest::whereFollowerId(Auth::user()->profile_id)
-                    ->whereFollowingId($user->id)
-                    ->exists() : false;
-
-                return view('profile.private', compact('user', 'is_following', 'requested'));
-            }
-
-            $is_admin = is_null($user->domain) ? $user->user->is_admin : false;
-            $profile = $user;
-            $settings = [
-                'crawlable' => $settings->crawlable,
-                'following' => [
-                    'count' => $settings->show_profile_following_count,
-                    'list' => $settings->show_profile_following,
-                ],
-                'followers' => [
-                    'count' => $settings->show_profile_follower_count,
-                    'list' => $settings->show_profile_followers,
-                ],
-            ];
-
-            return view('profile.show', compact('profile', 'settings'));
-        }
-    }
-
-    protected function getCachedUser($username, $withTrashed = false)
-    {
-        $val = str_replace(['_', '.', '-'], '', $username);
-        if (! ctype_alnum($val)) {
-            return;
-        }
-        $hash = ($withTrashed ? 'wt:' : 'wot:').strtolower($username);
-
-        return Cache::remember('pfc:cached-user:'.$hash, ($withTrashed ? 14400 : 900), function () use ($username, $withTrashed) {
-            if (! $withTrashed) {
-                return Profile::whereNull(['domain', 'status'])
-                    ->whereUsername($username)
-                    ->first();
-            } else {
-                return Profile::withTrashed()
-                    ->whereNull('domain')
-                    ->whereUsername($username)
-                    ->first();
-            }
-        });
-    }
-
-    public function permalinkRedirect(Request $request, $username)
-    {
-        if ($request->wantsJson() && (bool) config_cache('federation.activitypub.enabled')) {
-            $user = $this->getCachedUser($username, true);
-
-            return $this->showActivityPub($request, $user);
-        }
-
-        $user = $this->getCachedUser($username);
-
-        abort_if(! $user, 404);
-
-        return redirect($user->url());
-    }
-
-    protected function privateProfileCheck(Profile $profile, $loggedIn)
-    {
-        if (! Auth::check()) {
-            return true;
-        }
-
-        $user = Auth::user()->profile;
-        if ($user->id == $profile->id || ! $profile->is_private) {
-            return false;
-        }
-
-        $follows = Follower::whereProfileId($user->id)->whereFollowingId($profile->id)->exists();
-        if ($follows == false) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public static function accountCheck(Profile $profile)
-    {
-        switch ($profile->status) {
-            case 'disabled':
-            case 'suspended':
-            case 'delete':
-                return view('profile.disabled');
-                break;
-
-            default:
-                break;
-        }
-
-        return abort(404);
-    }
-
-    protected function blockedProfileCheck(Profile $profile)
-    {
-        $pid = Auth::user()->profile->id;
-        $blocks = UserFilter::whereUserId($profile->id)
-            ->whereFilterType('block')
-            ->whereFilterableType('App\Profile')
-            ->pluck('filterable_id')
-            ->toArray();
-        if (in_array($pid, $blocks)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function showActivityPub(Request $request, $user)
-    {
-        abort_if(! config_cache('federation.activitypub.enabled'), 404);
-        abort_if(! $user, 404, 'Not found');
-        abort_if($user->domain, 404);
-
-        return Cache::remember('pf:activitypub:user-object:by-id:'.$user->id, 1800, function () use ($user) {
-            $fractal = new Fractal\Manager();
-            $resource = new Fractal\Resource\Item($user, new ProfileTransformer);
-            $res = $fractal->createData($resource)->toArray();
-
-            return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json');
-        });
-    }
-
-    public function showAtomFeed(Request $request, $user)
-    {
-        abort_if(! config('federation.atom.enabled'), 404);
-
-        $pid = AccountService::usernameToId($user);
-
-        abort_if(! $pid, 404);
-
-        $profile = AccountService::get($pid, true);
-
-        abort_if(! $profile || $profile['locked'] || ! $profile['local'], 404);
-
-        $aiCheck = Cache::remember('profile:ai-check:spam-login:'.$profile['id'], 3600, function () use ($profile) {
-            $uid = User::whereProfileId($profile['id'])->first();
-            if (! $uid) {
-                return true;
-            }
-            $exists = AccountInterstitial::whereUserId($uid->id)->where('is_spam', 1)->count();
-            if ($exists) {
-                return true;
-            }
-
-            return false;
-        });
-
-        abort_if($aiCheck, 404);
-
-        $enabled = Cache::remember('profile:atom:enabled:'.$profile['id'], 84600, function () use ($profile) {
-            $uid = User::whereProfileId($profile['id'])->first();
-            if (! $uid) {
-                return false;
-            }
-            $settings = UserSetting::whereUserId($uid->id)->first();
-            if (! $settings) {
-                return false;
-            }
-
-            return $settings->show_atom;
-        });
-
-        abort_if(! $enabled, 404);
-
-        $data = Cache::remember('pf:atom:user-feed:by-id:'.$profile['id'], 14400, function () use ($pid, $profile) {
-            $items = Status::whereProfileId($pid)
-                ->whereScope('public')
-                ->whereIn('type', ['photo', 'photo:album'])
-                ->orderByDesc('id')
-                ->take(10)
-                ->get()
-                ->map(function ($status) {
-                    return StatusService::get($status->id, true);
-                })
-                ->filter(function ($status) {
-                    return $status &&
-                        isset($status['account']) &&
-                        isset($status['media_attachments']) &&
-                        count($status['media_attachments']);
-                })
-                ->values();
-            $permalink = config('app.url')."/users/{$profile['username']}.atom";
-            $headers = ['Content-Type' => 'application/atom+xml'];
-
-            if ($items && $items->count()) {
-                $headers['Last-Modified'] = now()->parse($items->first()['created_at'])->toRfc7231String();
-            }
-
-            return compact('items', 'permalink', 'headers');
-        });
-        abort_if(! $data || ! isset($data['items']) || ! isset($data['permalink']), 404);
-
-        return response()
-            ->view('atom.user',
-                [
-                    'profile' => $profile,
-                    'items' => $data['items'],
-                    'permalink' => $data['permalink'],
-                ]
-            )
-            ->withHeaders($data['headers']);
-    }
-
-    public function meRedirect()
-    {
-        abort_if(! Auth::check(), 404);
-
-        return redirect(Auth::user()->url());
-    }
-
-    public function embed(Request $request, $username)
-    {
-        $res = view('profile.embed-removed');
-
-        if (! (bool) config_cache('instance.embed.profile')) {
-            return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-        }
-
-        if (strlen($username) > 15 || strlen($username) < 2) {
-            return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-        }
-
-        $profile = $this->getCachedUser($username);
-
-        if (! $profile || $profile->is_private) {
-            return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-        }
-
-        $aiCheck = Cache::remember('profile:ai-check:spam-login:'.$profile->id, 3600, function () use ($profile) {
-            $exists = AccountInterstitial::whereUserId($profile->user_id)->where('is_spam', 1)->count();
-            if ($exists) {
-                return true;
-            }
-
-            return false;
-        });
-
-        if ($aiCheck) {
-            return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-        }
-
-        if (AccountService::canEmbed($profile->user_id) == false) {
-            return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-        }
-
-        $profile = AccountService::get($profile->id);
-        $res = view('profile.embed', compact('profile'));
-
-        return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-    }
-
-    public function stories(Request $request, $username)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-        $profile = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
-        $pid = $profile->id;
-        $authed = Auth::user()->profile_id;
-        abort_if($pid != $authed && ! FollowerService::follows($authed, $pid), 404);
-        $exists = Story::whereProfileId($pid)
-            ->whereActive(true)
-            ->exists();
-        abort_unless($exists, 404);
-
-        return view('profile.story', compact('pid', 'profile'));
-    }
+	public function show(Request $request, $username)
+	{
+		// redirect authed users to Metro 2.0
+		if($request->user()) {
+			// unless they force static view
+			if(!$request->has('fs') || $request->input('fs') != '1') {
+				$pid = AccountService::usernameToId($username);
+				if($pid) {
+					return redirect('/i/web/profile/' . $pid);
+				}
+			}
+		}
+
+		$user = Profile::whereNull('domain')
+			->whereNull('status')
+			->whereUsername($username)
+			->firstOrFail();
+
+
+		if($request->wantsJson() && config_cache('federation.activitypub.enabled')) {
+			return $this->showActivityPub($request, $user);
+		}
+
+		$aiCheck = Cache::remember('profile:ai-check:spam-login:' . $user->id, 86400, function() use($user) {
+			$exists = AccountInterstitial::whereUserId($user->user_id)->where('is_spam', 1)->count();
+			if($exists) {
+				return true;
+			}
+
+			return false;
+		});
+		if($aiCheck) {
+			return redirect('/login');
+		}
+		return $this->buildProfile($request, $user);
+	}
+
+	protected function buildProfile(Request $request, $user)
+	{
+		$username = $user->username;
+		$loggedIn = Auth::check();
+		$isPrivate = false;
+		$isBlocked = false;
+		if(!$loggedIn) {
+			$key = 'profile:settings:' . $user->id;
+			$ttl = now()->addHours(6);
+			$settings = Cache::remember($key, $ttl, function() use($user) {
+				return $user->user->settings;
+			});
+
+			if ($user->is_private == true) {
+				$profile = null;
+				return view('profile.private', compact('user'));
+			}
+
+			$owner = false;
+			$is_following = false;
+
+			$profile = $user;
+			$settings = [
+				'crawlable' => $settings->crawlable,
+				'following' => [
+					'count' => $settings->show_profile_following_count,
+					'list' => $settings->show_profile_following
+				],
+				'followers' => [
+					'count' => $settings->show_profile_follower_count,
+					'list' => $settings->show_profile_followers
+				]
+			];
+			return view('profile.show', compact('profile', 'settings'));
+		} else {
+			$key = 'profile:settings:' . $user->id;
+			$ttl = now()->addHours(6);
+			$settings = Cache::remember($key, $ttl, function() use($user) {
+				return $user->user->settings;
+			});
+
+			if ($user->is_private == true) {
+				$isPrivate = $this->privateProfileCheck($user, $loggedIn);
+			}
+
+			$isBlocked = $this->blockedProfileCheck($user);
+
+			$owner = $loggedIn && Auth::id() === $user->user_id;
+			$is_following = ($owner == false && Auth::check()) ? $user->followedBy(Auth::user()->profile) : false;
+
+			if ($isPrivate == true || $isBlocked == true) {
+				$requested = Auth::check() ? FollowRequest::whereFollowerId(Auth::user()->profile_id)
+					->whereFollowingId($user->id)
+					->exists() : false;
+				return view('profile.private', compact('user', 'is_following', 'requested'));
+			}
+
+			$is_admin = is_null($user->domain) ? $user->user->is_admin : false;
+			$profile = $user;
+			$settings = [
+				'crawlable' => $settings->crawlable,
+				'following' => [
+					'count' => $settings->show_profile_following_count,
+					'list' => $settings->show_profile_following
+				],
+				'followers' => [
+					'count' => $settings->show_profile_follower_count,
+					'list' => $settings->show_profile_followers
+				]
+			];
+			return view('profile.show', compact('profile', 'settings'));
+		}
+	}
+
+	public function permalinkRedirect(Request $request, $username)
+	{
+		$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
+
+		if ($request->wantsJson() && config_cache('federation.activitypub.enabled')) {
+			return $this->showActivityPub($request, $user);
+		}
+
+		return redirect($user->url());
+	}
+
+	protected function privateProfileCheck(Profile $profile, $loggedIn)
+	{
+		if (!Auth::check()) {
+			return true;
+		}
+
+		$user = Auth::user()->profile;
+		if($user->id == $profile->id || !$profile->is_private) {
+			return false;
+		}
+
+		$follows = Follower::whereProfileId($user->id)->whereFollowingId($profile->id)->exists();
+		if ($follows == false) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public static function accountCheck(Profile $profile)
+	{
+		switch ($profile->status) {
+			case 'disabled':
+			case 'suspended':
+			case 'delete':
+				return view('profile.disabled');
+				break;
+
+			default:
+				break;
+		}
+		return abort(404);
+	}
+
+	protected function blockedProfileCheck(Profile $profile)
+	{
+		$pid = Auth::user()->profile->id;
+		$blocks = UserFilter::whereUserId($profile->id)
+				->whereFilterType('block')
+				->whereFilterableType('App\Profile')
+				->pluck('filterable_id')
+				->toArray();
+		if (in_array($pid, $blocks)) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function showActivityPub(Request $request, $user)
+	{
+		abort_if(!config_cache('federation.activitypub.enabled'), 404);
+		abort_if($user->domain, 404);
+
+		return Cache::remember('pf:activitypub:user-object:by-id:' . $user->id, 3600, function() use($user) {
+			$fractal = new Fractal\Manager();
+			$resource = new Fractal\Resource\Item($user, new ProfileTransformer);
+			$res = $fractal->createData($resource)->toArray();
+			return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json');
+		});
+	}
+
+	public function showAtomFeed(Request $request, $user)
+	{
+		abort_if(!config('federation.atom.enabled'), 404);
+
+		$pid = AccountService::usernameToId($user);
+
+		abort_if(!$pid, 404);
+
+		$profile = AccountService::get($pid, true);
+
+		abort_if(!$profile || $profile['locked'] || !$profile['local'], 404);
+
+		$aiCheck = Cache::remember('profile:ai-check:spam-login:' . $profile['id'], 86400, function() use($profile) {
+			$uid = User::whereProfileId($profile['id'])->first();
+			if(!$uid) {
+				return true;
+			}
+			$exists = AccountInterstitial::whereUserId($uid->id)->where('is_spam', 1)->count();
+			if($exists) {
+				return true;
+			}
+
+			return false;
+		});
+
+		abort_if($aiCheck, 404);
+
+		$enabled = Cache::remember('profile:atom:enabled:' . $profile['id'], 84600, function() use ($profile) {
+			$uid = User::whereProfileId($profile['id'])->first();
+			if(!$uid) {
+				return false;
+			}
+			$settings = UserSetting::whereUserId($uid->id)->first();
+			if(!$settings) {
+				return false;
+			}
+
+			return $settings->show_atom;
+		});
+
+		abort_if(!$enabled, 404);
+
+		$data = Cache::remember('pf:atom:user-feed:by-id:' . $profile['id'], 900, function() use($pid, $profile) {
+			$items = DB::table('statuses')
+				->whereProfileId($pid)
+				->whereVisibility('public')
+				->whereType('photo')
+				->orderByDesc('id')
+				->take(10)
+				->get()
+				->map(function($status) {
+					return StatusService::get($status->id);
+				})
+				->filter(function($status) {
+					return $status &&
+						isset($status['account']) &&
+						isset($status['media_attachments']) &&
+						count($status['media_attachments']);
+				})
+				->values();
+			$permalink = config('app.url') . "/users/{$profile['username']}.atom";
+			$headers = ['Content-Type' => 'application/atom+xml'];
+
+			if($items && $items->count()) {
+				$headers['Last-Modified'] = now()->parse($items->first()['created_at'])->toRfc7231String();
+			}
+
+			return compact('items', 'permalink', 'headers');
+		});
+		abort_if(!$data || !isset($data['items']) || !isset($data['permalink']), 404);
+		return response()
+			->view('atom.user',
+				[
+					'profile' => $profile,
+					'items' => $data['items'],
+					'permalink' => $data['permalink']
+				]
+			)
+			->withHeaders($data['headers']);
+	}
+
+	public function meRedirect()
+	{
+		abort_if(!Auth::check(), 404);
+		return redirect(Auth::user()->url());
+	}
+
+	public function embed(Request $request, $username)
+	{
+		$res = view('profile.embed-removed');
+
+		if(!config('instance.embed.profile')) {
+			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+		}
+
+		if(strlen($username) > 15 || strlen($username) < 2) {
+			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+		}
+
+		$profile = Profile::whereUsername($username)
+			->whereIsPrivate(false)
+			->whereNull('status')
+			->whereNull('domain')
+			->first();
+
+		if(!$profile) {
+			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+		}
+
+		$aiCheck = Cache::remember('profile:ai-check:spam-login:' . $profile->id, 86400, function() use($profile) {
+			$exists = AccountInterstitial::whereUserId($profile->user_id)->where('is_spam', 1)->count();
+			if($exists) {
+				return true;
+			}
+
+			return false;
+		});
+
+		if($aiCheck) {
+			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+		}
+
+		if(AccountService::canEmbed($profile->user_id) == false) {
+			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+		}
+
+		$profile = AccountService::get($profile->id);
+		$res = view('profile.embed', compact('profile'));
+		return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+	}
+
+	public function stories(Request $request, $username)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+		$profile = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
+		$pid = $profile->id;
+		$authed = Auth::user()->profile_id;
+		abort_if($pid != $authed && !FollowerService::follows($authed, $pid), 404);
+		$exists = Story::whereProfileId($pid)
+			->whereActive(true)
+			->exists();
+		abort_unless($exists, 404);
+		return view('profile.story', compact('pid', 'profile'));
+	}
 }

app/Http/Controllers/ProfileMigrationController.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Http\Requests\ProfileMigrationStoreRequest;
-use App\Jobs\ProfilePipeline\ProfileMigrationDeliverMoveActivityPipeline;
-use App\Jobs\ProfilePipeline\ProfileMigrationMoveFollowersPipeline;
-use App\Models\ProfileAlias;
-use App\Models\ProfileMigration;
-use App\Services\AccountService;
-use App\Services\WebfingerService;
-use App\Util\ActivityPub\Helpers;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Bus;
-
-class ProfileMigrationController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-
-    public function index(Request $request)
-    {
-        abort_if((bool) config_cache('federation.activitypub.enabled') === false, 404);
-        if ((bool) config_cache('federation.migration') === false) {
-            return redirect(route('help.account-migration'));
-        }
-        $hasExistingMigration = ProfileMigration::whereProfileId($request->user()->profile_id)
-            ->where('created_at', '>', now()->subDays(30))
-            ->exists();
-
-        return view('settings.migration.index', compact('hasExistingMigration'));
-    }
-
-    public function store(ProfileMigrationStoreRequest $request)
-    {
-        abort_if((bool) config_cache('federation.activitypub.enabled') === false, 404);
-        $acct = WebfingerService::rawGet($request->safe()->acct);
-        if (! $acct) {
-            return redirect()->back()->withErrors(['acct' => 'The new account you provided is not responding to our requests.']);
-        }
-        $newAccount = Helpers::profileFetch($acct);
-        if (! $newAccount) {
-            return redirect()->back()->withErrors(['acct' => 'An error occured, please try again later. Code: res-failed-account-fetch']);
-        }
-        $user = $request->user();
-        ProfileAlias::updateOrCreate([
-            'profile_id' => $user->profile_id,
-            'acct' => $request->safe()->acct,
-            'uri' => $acct,
-        ]);
-        $migration = ProfileMigration::create([
-            'profile_id' => $request->user()->profile_id,
-            'acct' => $request->safe()->acct,
-            'followers_count' => $request->user()->profile->followers_count,
-            'target_profile_id' => $newAccount['id'],
-        ]);
-        $user->profile->update([
-            'moved_to_profile_id' => $newAccount->id,
-            'indexable' => false,
-        ]);
-        AccountService::del($user->profile_id);
-
-        Bus::batch([
-            new ProfileMigrationDeliverMoveActivityPipeline($migration, $user->profile, $newAccount),
-            new ProfileMigrationMoveFollowersPipeline($user->profile_id, $newAccount->id),
-        ])->onQueue('follow')->dispatch();
-
-        return redirect()->back()->with(['status' => 'Succesfully migrated account!']);
-    }
-}

app/Http/Controllers/PublicApiController.php

@@ -42,7 +42,6 @@ use App\Services\{
 use App\Jobs\StatusPipeline\NewStatusPipeline;
 use League\Fractal\Serializer\ArraySerializer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use App\Services\InstanceService;
 
 class PublicApiController extends Controller
 {
@@ -662,10 +661,6 @@ class PublicApiController extends Controller
     public function account(Request $request, $id)
     {
         $res = AccountService::get($id);
-        if($res && isset($res['local'], $res['url']) && !$res['local']) {
-            $domain = parse_url($res['url'], PHP_URL_HOST);
-            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
-        }
         return response()->json($res);
     }
 
@@ -685,11 +680,6 @@ class PublicApiController extends Controller
         $profile = AccountService::get($id);
         abort_if(!$profile, 404);
 
-        if($profile && isset($profile['local'], $profile['url']) && !$profile['local']) {
-            $domain = parse_url($profile['url'], PHP_URL_HOST);
-            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
-        }
-
         $limit = $request->limit ?? 9;
         $max_id = $request->max_id;
         $min_id = $request->min_id;

app/Http/Controllers/RemoteAuthController.php

@@ -2,36 +2,30 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\RemoteAuth;
-use App\Services\Account\RemoteAuthService;
-use App\Services\EmailService;
-use App\Services\MediaStorageService;
-use App\User;
-use App\Util\ActivityPub\Helpers;
-use App\Util\Lexer\RestrictedNames;
-use Illuminate\Auth\Events\Registered;
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
+use App\Services\Account\RemoteAuthService;
+use App\Models\RemoteAuth;
+use App\Profile;
+use App\User;
+use Purify;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Str;
+use Illuminate\Auth\Events\Registered;
+use App\Util\Lexer\RestrictedNames;
+use App\Services\EmailService;
+use App\Services\MediaStorageService;
+use App\Util\ActivityPub\Helpers;
 use InvalidArgumentException;
-use Purify;
 
 class RemoteAuthController extends Controller
 {
     public function start(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
-        if ($request->user()) {
+        abort_unless(config_cache('pixelfed.open_registration') && config('remote-auth.mastodon.enabled'), 404);
+        if($request->user()) {
             return redirect('/');
         }
-
         return view('auth.remote.start');
     }
 
@@ -42,35 +36,12 @@ class RemoteAuthController extends Controller
 
     public function getAuthDomains(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
-
-        if (config('remote-auth.mastodon.domains.only_custom')) {
+        if(config('remote-auth.mastodon.domains.only_custom')) {
             $res = config('remote-auth.mastodon.domains.custom');
-            if (! $res || ! strlen($res)) {
+            if(!$res || !strlen($res)) {
                 return [];
             }
             $res = explode(',', $res);
-
-            return response()->json($res);
-        }
-
-        if (config('remote-auth.mastodon.domains.custom') &&
-            ! config('remote-auth.mastodon.domains.only_default') &&
-            strlen(config('remote-auth.mastodon.domains.custom')) > 3 &&
-            strpos(config('remote-auth.mastodon.domains.custom'), '.') > -1
-        ) {
-            $res = config('remote-auth.mastodon.domains.custom');
-            if (! $res || ! strlen($res)) {
-                return [];
-            }
-            $res = explode(',', $res);
-
             return response()->json($res);
         }
 
@@ -82,74 +53,41 @@ class RemoteAuthController extends Controller
 
     public function redirect(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
-
+        abort_unless(config_cache('pixelfed.open_registration') && config('remote-auth.mastodon.enabled'), 404);
         $this->validate($request, ['domain' => 'required']);
 
         $domain = $request->input('domain');
-
-        if (str_starts_with(strtolower($domain), 'http')) {
-            $res = [
-                'domain' => $domain,
-                'ready' => false,
-                'action' => 'incompatible_domain',
-            ];
-
-            return response()->json($res);
-        }
-
-        $validateInstance = Helpers::validateUrl('https://'.$domain.'/?block-check='.time());
-
-        if (! $validateInstance) {
-            $res = [
-                'domain' => $domain,
-                'ready' => false,
-                'action' => 'blocked_domain',
-            ];
-
-            return response()->json($res);
-        }
-
         $compatible = RemoteAuthService::isDomainCompatible($domain);
 
-        if (! $compatible) {
+        if(!$compatible) {
             $res = [
                 'domain' => $domain,
                 'ready' => false,
-                'action' => 'incompatible_domain',
+                'action' => 'incompatible_domain'
             ];
-
             return response()->json($res);
         }
 
-        if (config('remote-auth.mastodon.domains.only_default')) {
+        if(config('remote-auth.mastodon.domains.only_default')) {
             $defaultDomains = explode(',', config('remote-auth.mastodon.domains.default'));
-            if (! in_array($domain, $defaultDomains)) {
+            if(!in_array($domain, $defaultDomains)) {
                 $res = [
                     'domain' => $domain,
                     'ready' => false,
-                    'action' => 'incompatible_domain',
+                    'action' => 'incompatible_domain'
                 ];
-
                 return response()->json($res);
             }
         }
 
-        if (config('remote-auth.mastodon.domains.only_custom') && config('remote-auth.mastodon.domains.custom')) {
+        if(config('remote-auth.mastodon.domains.only_custom') && config('remote-auth.mastodon.domains.custom')) {
             $customDomains = explode(',', config('remote-auth.mastodon.domains.custom'));
-            if (! in_array($domain, $customDomains)) {
+            if(!in_array($domain, $customDomains)) {
                 $res = [
                     'domain' => $domain,
                     'ready' => false,
-                    'action' => 'incompatible_domain',
+                    'action' => 'incompatible_domain'
                 ];
-
                 return response()->json($res);
             }
         }
@@ -169,13 +107,13 @@ class RemoteAuthController extends Controller
             'state' => $state,
         ]);
 
-        $request->session()->put('oauth_redirect_to', 'https://'.$domain.'/oauth/authorize?'.$query);
+        $request->session()->put('oauth_redirect_to', 'https://' . $domain . '/oauth/authorize?' . $query);
 
         $dsh = Str::random(17);
         $res = [
             'domain' => $domain,
             'ready' => true,
-            'dsh' => $dsh,
+            'dsh' => $dsh
         ];
 
         return response()->json($res);
@@ -183,15 +121,7 @@ class RemoteAuthController extends Controller
 
     public function preflight(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
-
-        if (! $request->filled('d') || ! $request->filled('dsh') || ! $request->session()->exists('oauth_redirect_to')) {
+        if(!$request->filled('d') || !$request->filled('dsh') || !$request->session()->exists('oauth_redirect_to')) {
             return redirect('/login');
         }
 
@@ -200,17 +130,9 @@ class RemoteAuthController extends Controller
 
     public function handleCallback(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
-
         $domain = $request->session()->get('oauth_domain');
 
-        if ($request->filled('code')) {
+        if($request->filled('code')) {
             $code = $request->input('code');
             $state = $request->session()->pull('state');
 
@@ -222,14 +144,12 @@ class RemoteAuthController extends Controller
 
             $res = RemoteAuthService::getToken($domain, $code);
 
-            if (! $res || ! isset($res['access_token'])) {
+            if(!$res || !isset($res['access_token'])) {
                 $request->session()->regenerate();
-
                 return redirect('/login');
             }
 
             $request->session()->put('oauth_remote_session_token', $res['access_token']);
-
             return redirect('/auth/mastodon/getting-started');
         }
 
@@ -238,29 +158,15 @@ class RemoteAuthController extends Controller
 
     public function onboarding(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
-        if ($request->user()) {
+        abort_unless(config_cache('pixelfed.open_registration') && config('remote-auth.mastodon.enabled'), 404);
+        if($request->user()) {
             return redirect('/');
         }
-
         return view('auth.remote.onboarding');
     }
 
     public function sessionCheck(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
         abort_if($request->user(), 403);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
@@ -270,48 +176,41 @@ class RemoteAuthController extends Controller
 
         $res = RemoteAuthService::getVerifyCredentials($domain, $token);
 
-        abort_if(! $res || ! isset($res['acct']), 403, 'Invalid credentials');
+        abort_if(!$res || !isset($res['acct']), 403, 'Invalid credentials');
 
-        $webfinger = strtolower('@'.$res['acct'].'@'.$domain);
+        $webfinger = strtolower('@' . $res['acct'] . '@' . $domain);
         $request->session()->put('oauth_masto_webfinger', $webfinger);
 
-        if (config('remote-auth.mastodon.max_uses.enabled')) {
+        if(config('remote-auth.mastodon.max_uses.enabled')) {
             $limit = config('remote-auth.mastodon.max_uses.limit');
             $uses = RemoteAuthService::lookupWebfingerUses($webfinger);
-            if ($uses >= $limit) {
+            if($uses >= $limit) {
                 return response()->json([
                     'code' => 200,
                     'msg' => 'Success!',
-                    'action' => 'max_uses_reached',
+                    'action' => 'max_uses_reached'
                 ]);
             }
         }
 
         $exists = RemoteAuth::whereDomain($domain)->where('webfinger', $webfinger)->whereNotNull('user_id')->first();
-        if ($exists && $exists->user_id) {
+        if($exists && $exists->user_id) {
             return response()->json([
                 'code' => 200,
                 'msg' => 'Success!',
-                'action' => 'redirect_existing_user',
+                'action' => 'redirect_existing_user'
             ]);
         }
 
         return response()->json([
             'code' => 200,
             'msg' => 'Success!',
-            'action' => 'onboard',
+            'action' => 'onboard'
         ]);
     }
 
     public function sessionGetMastodonData(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
         abort_if($request->user(), 403);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
@@ -320,7 +219,7 @@ class RemoteAuthController extends Controller
         $token = $request->session()->get('oauth_remote_session_token');
 
         $res = RemoteAuthService::getVerifyCredentials($domain, $token);
-        $res['_webfinger'] = strtolower('@'.$res['acct'].'@'.$domain);
+        $res['_webfinger'] = strtolower('@' . $res['acct'] . '@' . $domain);
         $res['_domain'] = strtolower($domain);
         $request->session()->put('oauth_remasto_id', $res['id']);
 
@@ -333,7 +232,7 @@ class RemoteAuthController extends Controller
             'bearer_token' => $token,
             'verify_credentials' => $res,
             'last_verify_credentials_at' => now(),
-            'last_successful_login_at' => now(),
+            'last_successful_login_at' => now()
         ]);
 
         $request->session()->put('oauth_masto_raid', $ra->id);
@@ -343,13 +242,6 @@ class RemoteAuthController extends Controller
 
     public function sessionValidateUsername(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
         abort_if($request->user(), 403);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
@@ -364,24 +256,24 @@ class RemoteAuthController extends Controller
                     $underscore = substr_count($value, '_');
                     $period = substr_count($value, '.');
 
-                    if (ends_with($value, ['.php', '.js', '.css'])) {
+                    if(ends_with($value, ['.php', '.js', '.css'])) {
                         return $fail('Username is invalid.');
                     }
 
-                    if (($dash + $underscore + $period) > 1) {
+                    if(($dash + $underscore + $period) > 1) {
                         return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).');
                     }
 
-                    if (! ctype_alnum($value[0])) {
+                    if (!ctype_alnum($value[0])) {
                         return $fail('Username is invalid. Must start with a letter or number.');
                     }
 
-                    if (! ctype_alnum($value[strlen($value) - 1])) {
+                    if (!ctype_alnum($value[strlen($value) - 1])) {
                         return $fail('Username is invalid. Must end with a letter or number.');
                     }
 
                     $val = str_replace(['_', '.', '-'], '', $value);
-                    if (! ctype_alnum($val)) {
+                    if(!ctype_alnum($val)) {
                         return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).');
                     }
 
@@ -389,8 +281,8 @@ class RemoteAuthController extends Controller
                     if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
                         return $fail('Username cannot be used.');
                     }
-                },
-            ],
+                }
+            ]
         ]);
         $username = strtolower($request->input('username'));
 
@@ -399,19 +291,12 @@ class RemoteAuthController extends Controller
         return response()->json([
             'code' => 200,
             'username' => $username,
-            'exists' => $exists,
+            'exists' => $exists
         ]);
     }
 
     public function sessionValidateEmail(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
         abort_if($request->user(), 403);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
@@ -420,7 +305,7 @@ class RemoteAuthController extends Controller
             'email' => [
                 'required',
                 'email:strict,filter_unicode,dns,spoof',
-            ],
+            ]
         ]);
 
         $email = $request->input('email');
@@ -431,19 +316,12 @@ class RemoteAuthController extends Controller
             'code' => 200,
             'email' => $email,
             'exists' => $exists,
-            'banned' => $banned,
+            'banned' => $banned
         ]);
     }
 
     public function sessionGetMastodonFollowers(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
         abort_unless($request->session()->exists('oauth_remasto_id'), 403);
@@ -454,30 +332,23 @@ class RemoteAuthController extends Controller
 
         $res = RemoteAuthService::getFollowing($domain, $token, $id);
 
-        if (! $res) {
+        if(!$res) {
             return response()->json([
                 'code' => 200,
-                'following' => [],
+                'following' => []
             ]);
         }
 
-        $res = collect($res)->filter(fn ($acct) => Helpers::validateUrl($acct['url']))->values()->toArray();
+        $res = collect($res)->filter(fn($acct) => Helpers::validateUrl($acct['url']))->values()->toArray();
 
         return response()->json([
             'code' => 200,
-            'following' => $res,
+            'following' => $res
         ]);
     }
 
     public function handleSubmit(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
         abort_unless($request->session()->exists('oauth_remasto_id'), 403);
@@ -496,24 +367,24 @@ class RemoteAuthController extends Controller
                     $underscore = substr_count($value, '_');
                     $period = substr_count($value, '.');
 
-                    if (ends_with($value, ['.php', '.js', '.css'])) {
+                    if(ends_with($value, ['.php', '.js', '.css'])) {
                         return $fail('Username is invalid.');
                     }
 
-                    if (($dash + $underscore + $period) > 1) {
+                    if(($dash + $underscore + $period) > 1) {
                         return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).');
                     }
 
-                    if (! ctype_alnum($value[0])) {
+                    if (!ctype_alnum($value[0])) {
                         return $fail('Username is invalid. Must start with a letter or number.');
                     }
 
-                    if (! ctype_alnum($value[strlen($value) - 1])) {
+                    if (!ctype_alnum($value[strlen($value) - 1])) {
                         return $fail('Username is invalid. Must end with a letter or number.');
                     }
 
                     $val = str_replace(['_', '.', '-'], '', $value);
-                    if (! ctype_alnum($val)) {
+                    if(!ctype_alnum($val)) {
                         return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).');
                     }
 
@@ -521,10 +392,10 @@ class RemoteAuthController extends Controller
                     if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
                         return $fail('Username cannot be used.');
                     }
-                },
+                }
             ],
             'password' => 'required|string|min:8|confirmed',
-            'name' => 'nullable|max:30',
+            'name' => 'nullable|max:30'
         ]);
 
         $email = $request->input('email');
@@ -536,7 +407,7 @@ class RemoteAuthController extends Controller
             'name' => $name,
             'username' => $username,
             'password' => $password,
-            'email' => $email,
+            'email' => $email
         ]);
 
         $raid = $request->session()->pull('oauth_masto_raid');
@@ -550,19 +421,13 @@ class RemoteAuthController extends Controller
         return [
             'code' => 200,
             'msg' => 'Success',
-            'token' => $token,
+            'token' => $token
         ];
     }
 
     public function storeBio(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
+        abort_unless(config_cache('pixelfed.open_registration') && config('remote-auth.mastodon.enabled'), 404);
         abort_unless($request->user(), 404);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
@@ -581,20 +446,14 @@ class RemoteAuthController extends Controller
 
     public function accountToId(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
+        abort_unless(config_cache('pixelfed.open_registration') && config('remote-auth.mastodon.enabled'), 404);
         abort_if($request->user(), 404);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
         abort_unless($request->session()->exists('oauth_remasto_id'), 403);
 
         $this->validate($request, [
-            'account' => 'required|url',
+            'account' => 'required|url'
         ]);
 
         $account = $request->input('account');
@@ -603,10 +462,10 @@ class RemoteAuthController extends Controller
         $host = strtolower(config('pixelfed.domain.app'));
         $domain = strtolower(parse_url($account, PHP_URL_HOST));
 
-        if ($domain == $host) {
+        if($domain == $host) {
             $username = Str::of($account)->explode('/')->last();
             $user = User::where('username', $username)->first();
-            if ($user) {
+            if($user) {
                 return ['id' => (string) $user->profile_id];
             } else {
                 return [];
@@ -614,7 +473,7 @@ class RemoteAuthController extends Controller
         } else {
             try {
                 $profile = Helpers::profileFetch($account);
-                if ($profile) {
+                if($profile) {
                     return ['id' => (string) $profile->id];
                 } else {
                     return [];
@@ -629,13 +488,7 @@ class RemoteAuthController extends Controller
 
     public function storeAvatar(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
+        abort_unless(config_cache('pixelfed.open_registration') && config('remote-auth.mastodon.enabled'), 404);
         abort_unless($request->user(), 404);
         $this->validate($request, [
             'avatar_url' => 'required|active_url',
@@ -644,29 +497,23 @@ class RemoteAuthController extends Controller
         $user = $request->user();
         $profile = $user->profile;
 
-        abort_if(! $profile->avatar, 404, 'Missing avatar');
+        abort_if(!$profile->avatar, 404, 'Missing avatar');
 
         $avatar = $profile->avatar;
         $avatar->remote_url = $request->input('avatar_url');
         $avatar->save();
 
-        MediaStorageService::avatar($avatar, (bool) config_cache('pixelfed.cloud_storage') == false);
+        MediaStorageService::avatar($avatar, config_cache('pixelfed.cloud_storage') == false);
 
         return [200];
     }
 
     public function finishUp(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
+        abort_unless(config_cache('pixelfed.open_registration') && config('remote-auth.mastodon.enabled'), 404);
         abort_unless($request->user(), 404);
 
-        $currentWebfinger = '@'.$request->user()->username.'@'.config('pixelfed.domain.app');
+        $currentWebfinger = '@' . $request->user()->username . '@' . config('pixelfed.domain.app');
         $ra = RemoteAuth::where('user_id', $request->user()->id)->firstOrFail();
         RemoteAuthService::submitToBeagle(
             $ra->webfinger,
@@ -680,13 +527,7 @@ class RemoteAuthController extends Controller
 
     public function handleLogin(Request $request)
     {
-        abort_unless((
-            config_cache('pixelfed.open_registration') &&
-            config('remote-auth.mastodon.enabled')
-        ) || (
-            config('remote-auth.mastodon.ignore_closed_state') &&
-            config('remote-auth.mastodon.enabled')
-        ), 404);
+        abort_unless(config_cache('pixelfed.open_registration') && config('remote-auth.mastodon.enabled'), 404);
         abort_if($request->user(), 404);
         abort_unless($request->session()->exists('oauth_domain'), 403);
         abort_unless($request->session()->exists('oauth_remote_session_token'), 403);
@@ -700,20 +541,19 @@ class RemoteAuthController extends Controller
         $user = User::findOrFail($ra->user_id);
         abort_if($user->is_admin || $user->status != null, 422, 'Invalid auth action');
         Auth::loginUsingId($ra->user_id);
-
         return [200];
     }
 
     protected function createUser($data)
     {
         event(new Registered($user = User::create([
-            'name' => Purify::clean($data['name']),
+            'name'     => Purify::clean($data['name']),
             'username' => $data['username'],
-            'email' => $data['email'],
+            'email'    => $data['email'],
             'password' => Hash::make($data['password']),
             'email_verified_at' => config('remote-auth.mastodon.contraints.skip_email_verification') ? now() : null,
             'app_register_ip' => request()->ip(),
-            'register_source' => 'mastodon',
+            'register_source' => 'mastodon'
         ])));
 
         $this->guarder()->login($user);

app/Http/Controllers/SearchController.php

@@ -2,367 +2,368 @@
 
 namespace App\Http\Controllers;
 
+use Auth;
 use App\Hashtag;
 use App\Place;
 use App\Profile;
-use App\Services\WebfingerService;
 use App\Status;
-use App\Util\ActivityPub\Helpers;
-use Auth;
 use Illuminate\Http\Request;
+use App\Util\ActivityPub\Helpers;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
+use App\Transformer\Api\{
+	AccountTransformer,
+	HashtagTransformer,
+	StatusTransformer,
+};
+use App\Services\WebfingerService;
 
 class SearchController extends Controller
 {
-    public $tokens = [];
+	public $tokens = [];
+	public $term = '';
+	public $hash = '';
+	public $cacheKey = 'api:search:tag:';
 
-    public $term = '';
+	public function __construct()
+	{
+		$this->middleware('auth');
+	}
 
-    public $hash = '';
+	public function searchAPI(Request $request)
+	{
+		$this->validate($request, [
+			'q' => 'required|string|min:3|max:120',
+			'src' => 'required|string|in:metro',
+			'v' => 'required|integer|in:2',
+			'scope' => 'required|in:all,hashtag,profile,remote,webfinger'
+		]);
 
-    public $cacheKey = 'api:search:tag:';
+		$scope = $request->input('scope') ?? 'all';
+		$this->term = e(urldecode($request->input('q')));
+		$this->hash = hash('sha256', $this->term);
 
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
+		switch ($scope) {
+			case 'all':
+				$this->getHashtags();
+				$this->getPosts();
+				$this->getProfiles();
+				// $this->getPlaces();
+				break;
 
-    public function searchAPI(Request $request)
-    {
-        $this->validate($request, [
-            'q' => 'required|string|min:3|max:120',
-            'src' => 'required|string|in:metro',
-            'v' => 'required|integer|in:2',
-            'scope' => 'required|in:all,hashtag,profile,remote,webfinger',
-        ]);
+			case 'hashtag':
+				$this->getHashtags();
+				break;
 
-        $scope = $request->input('scope') ?? 'all';
-        $this->term = e(urldecode($request->input('q')));
-        $this->hash = hash('sha256', $this->term);
+			case 'profile':
+				$this->getProfiles();
+				break;
 
-        switch ($scope) {
-            case 'all':
-                $this->getHashtags();
-                $this->getPosts();
-                $this->getProfiles();
-                // $this->getPlaces();
-                break;
+			case 'webfinger':
+				$this->webfingerSearch();
+				break;
 
-            case 'hashtag':
-                $this->getHashtags();
-                break;
+			case 'remote':
+				$this->remoteLookupSearch();
+				break;
 
-            case 'profile':
-                $this->getProfiles();
-                break;
+			case 'place':
+				$this->getPlaces();
+				break;
 
-            case 'webfinger':
-                $this->webfingerSearch();
-                break;
+			default:
+				break;
+		}
 
-            case 'remote':
-                $this->remoteLookupSearch();
-                break;
+		return response()->json($this->tokens, 200, [], JSON_PRETTY_PRINT);
+	}
 
-            case 'place':
-                $this->getPlaces();
-                break;
+	protected function getPosts()
+	{
+		$tag = $this->term;
+		$hash = hash('sha256', $tag);
+		if( Helpers::validateUrl($tag) != false &&
+			Helpers::validateLocalUrl($tag) != true &&
+			config_cache('federation.activitypub.enabled') == true &&
+			config('federation.activitypub.remoteFollow') == true
+		) {
+			$remote = Helpers::fetchFromUrl($tag);
+			if( isset($remote['type']) &&
+				$remote['type'] == 'Note') {
+				$item = Helpers::statusFetch($tag);
+				$this->tokens['posts'] = [[
+					'count'  => 0,
+					'url'    => $item->url(),
+					'type'   => 'status',
+					'value'  => "by {$item->profile->username} <span class='float-right'>{$item->created_at->diffForHumans(null, true, true)}</span>",
+					'tokens' => [$item->caption],
+					'name'   => $item->caption,
+					'thumb'  => $item->thumb(),
+				]];
+			}
+		} else {
+			$posts = Status::select('id', 'profile_id', 'caption', 'created_at')
+						->whereHas('media')
+						->whereNull('in_reply_to_id')
+						->whereNull('reblog_of_id')
+						->whereProfileId(Auth::user()->profile_id)
+						->where('caption', 'like', '%'.$tag.'%')
+						->latest()
+						->limit(10)
+						->get();
 
-            default:
-                break;
-        }
+			if($posts->count() > 0) {
+				$posts = $posts->map(function($item, $key) {
+					return [
+						'count'  => 0,
+						'url'    => $item->url(),
+						'type'   => 'status',
+						'value'  => "by {$item->profile->username} <span class='float-right'>{$item->created_at->diffForHumans(null, true, true)}</span>",
+						'tokens' => [$item->caption],
+						'name'   => $item->caption,
+						'thumb'  => $item->thumb(),
+						'filter' => $item->firstMedia()->filter_class
+					];
+				});
+				$this->tokens['posts'] = $posts;
+			}
+		}
+	}
 
-        return response()->json($this->tokens, 200, [], JSON_PRETTY_PRINT);
-    }
+	protected function getHashtags()
+	{
+		$tag = $this->term;
+		$key = $this->cacheKey . 'hashtags:' . $this->hash;
+		$ttl = now()->addMinutes(1);
+		$tokens = Cache::remember($key, $ttl, function() use($tag) {
+			$htag = Str::startsWith($tag, '#') == true ? mb_substr($tag, 1) : $tag;
+			$hashtags = Hashtag::select('id', 'name', 'slug')
+				->where('slug', 'like', '%'.$htag.'%')
+				->whereHas('posts')
+				->limit(20)
+				->get();
+			if($hashtags->count() > 0) {
+				$tags = $hashtags->map(function ($item, $key) {
+					return [
+						'count'  => $item->posts()->count(),
+						'url'    => $item->url(),
+						'type'   => 'hashtag',
+						'value'  => $item->name,
+						'tokens' => '',
+						'name'   => null,
+					];
+				});
+				return $tags;
+			}
+		});
+		$this->tokens['hashtags'] = $tokens;
+	}
 
-    protected function getPosts()
-    {
-        $tag = $this->term;
-        $hash = hash('sha256', $tag);
-        if (Helpers::validateUrl($tag) != false &&
-            Helpers::validateLocalUrl($tag) != true &&
-            (bool) config_cache('federation.activitypub.enabled') == true &&
-            config('federation.activitypub.remoteFollow') == true
-        ) {
-            $remote = Helpers::fetchFromUrl($tag);
-            if (isset($remote['type']) &&
-                in_array($remote['type'], ['Note', 'Question'])
-            ) {
-                $item = Helpers::statusFetch($tag);
-                $this->tokens['posts'] = [[
-                    'count' => 0,
-                    'url' => $item->url(),
-                    'type' => 'status',
-                    'value' => "by {$item->profile->username} <span class='float-right'>{$item->created_at->diffForHumans(null, true, true)}</span>",
-                    'tokens' => [$item->caption],
-                    'name' => $item->caption,
-                    'thumb' => $item->thumb(),
-                ]];
-            }
-        } else {
-            $posts = Status::select('id', 'profile_id', 'caption', 'created_at')
-                ->whereHas('media')
-                ->whereNull('in_reply_to_id')
-                ->whereNull('reblog_of_id')
-                ->whereProfileId(Auth::user()->profile_id)
-                ->where('caption', 'like', '%'.$tag.'%')
-                ->latest()
-                ->limit(10)
-                ->get();
+	protected function getPlaces()
+	{
+		$tag = $this->term;
+		// $key = $this->cacheKey . 'places:' . $this->hash;
+		// $ttl = now()->addHours(12);
+		// $tokens = Cache::remember($key, $ttl, function() use($tag) {
+			$htag = Str::contains($tag, ',') == true ? explode(',', $tag) : [$tag];
+			$hashtags = Place::select('id', 'name', 'slug', 'country')
+				->where('name', 'like', '%'.$htag[0].'%')
+				->paginate(20);
+			$tags = [];
+			if($hashtags->count() > 0) {
+				$tags = $hashtags->map(function ($item, $key) {
+					return [
+						'count'     => null,
+						'url'       => $item->url(),
+						'type'      => 'place',
+						'value'     => $item->name . ', ' . $item->country,
+						'tokens'    => '',
+						'name'      => null,
+						'city'      => $item->name,
+						'country'   => $item->country
+					];
+				});
+				// return $tags;
+			}
+		// });
+		$this->tokens['places'] = $tags;
+		$this->tokens['placesPagination'] = [
+			'total' => $hashtags->total(),
+			'current_page' => $hashtags->currentPage(),
+			'last_page' => $hashtags->lastPage()
+		];
+	}
 
-            if ($posts->count() > 0) {
-                $posts = $posts->map(function ($item, $key) {
-                    return [
-                        'count' => 0,
-                        'url' => $item->url(),
-                        'type' => 'status',
-                        'value' => "by {$item->profile->username} <span class='float-right'>{$item->created_at->diffForHumans(null, true, true)}</span>",
-                        'tokens' => [$item->caption],
-                        'name' => $item->caption,
-                        'thumb' => $item->thumb(),
-                        'filter' => $item->firstMedia()->filter_class,
-                    ];
-                });
-                $this->tokens['posts'] = $posts;
-            }
-        }
-    }
+	protected function getProfiles()
+	{
+		$tag = $this->term;
+		$remoteKey = $this->cacheKey . 'profiles:remote:' . $this->hash;
+		$key = $this->cacheKey . 'profiles:' . $this->hash;
+		$remoteTtl = now()->addMinutes(15);
+		$ttl = now()->addHours(2);
+		if( Helpers::validateUrl($tag) != false &&
+			Helpers::validateLocalUrl($tag) != true &&
+			config_cache('federation.activitypub.enabled') == true &&
+			config('federation.activitypub.remoteFollow') == true
+		) {
+			$remote = Helpers::fetchFromUrl($tag);
+			if( isset($remote['type']) &&
+				$remote['type'] == 'Person'
+			) {
+				$this->tokens['profiles'] = Cache::remember($remoteKey, $remoteTtl, function() use($tag) {
+					$item = Helpers::profileFirstOrNew($tag);
+					$tokens = [[
+						'count'  => 1,
+						'url'    => $item->url(),
+						'type'   => 'profile',
+						'value'  => $item->username,
+						'tokens' => [$item->username],
+						'name'   => $item->name,
+						'entity' => [
+							'id' => (string) $item->id,
+							'following' => $item->followedBy(Auth::user()->profile),
+							'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
+							'thumb' => $item->avatarUrl(),
+							'local' => (bool) !$item->domain,
+							'post_count' => $item->statuses()->count()
+						]
+					]];
+					return $tokens;
+				});
+			}
+		}
 
-    protected function getHashtags()
-    {
-        $tag = $this->term;
-        $key = $this->cacheKey.'hashtags:'.$this->hash;
-        $ttl = now()->addMinutes(1);
-        $tokens = Cache::remember($key, $ttl, function () use ($tag) {
-            $htag = Str::startsWith($tag, '#') == true ? mb_substr($tag, 1) : $tag;
-            $hashtags = Hashtag::select('id', 'name', 'slug')
-                ->where('slug', 'like', '%'.$htag.'%')
-                ->whereHas('posts')
-                ->limit(20)
-                ->get();
-            if ($hashtags->count() > 0) {
-                $tags = $hashtags->map(function ($item, $key) {
-                    return [
-                        'count' => $item->posts()->count(),
-                        'url' => $item->url(),
-                        'type' => 'hashtag',
-                        'value' => $item->name,
-                        'tokens' => '',
-                        'name' => null,
-                    ];
-                });
+		else {
+			$this->tokens['profiles'] = Cache::remember($key, $ttl, function() use($tag) {
+				if(Str::startsWith($tag, '@')) {
+					$tag = substr($tag, 1);
+				}
+				$users = Profile::select('status', 'domain', 'username', 'name', 'id')
+					->whereNull('status')
+					->where('username', 'like', '%'.$tag.'%')
+					->limit(20)
+					->orderBy('domain')
+					->get();
 
-                return $tags;
-            }
-        });
-        $this->tokens['hashtags'] = $tokens;
-    }
+				if($users->count() > 0) {
+					return $users->map(function ($item, $key) {
+						return [
+							'count'  => 0,
+							'url'    => $item->url(),
+							'type'   => 'profile',
+							'value'  => $item->username,
+							'tokens' => [$item->username],
+							'name'   => $item->name,
+							'avatar' => $item->avatarUrl(),
+							'id'     =>  (string) $item->id,
+							'entity' => [
+								'id' => (string) $item->id,
+								'following' => $item->followedBy(Auth::user()->profile),
+								'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
+								'thumb' => $item->avatarUrl(),
+								'local' => (bool) !$item->domain,
+								'post_count' => $item->statuses()->count()
+							]
+						];
+					});
+				}
+			});
+		}
+	}
 
-    protected function getPlaces()
-    {
-        $tag = $this->term;
-        // $key = $this->cacheKey . 'places:' . $this->hash;
-        // $ttl = now()->addHours(12);
-        // $tokens = Cache::remember($key, $ttl, function() use($tag) {
-        $htag = Str::contains($tag, ',') == true ? explode(',', $tag) : [$tag];
-        $hashtags = Place::select('id', 'name', 'slug', 'country')
-            ->where('name', 'like', '%'.$htag[0].'%')
-            ->paginate(20);
-        $tags = [];
-        if ($hashtags->count() > 0) {
-            $tags = $hashtags->map(function ($item, $key) {
-                return [
-                    'count' => null,
-                    'url' => $item->url(),
-                    'type' => 'place',
-                    'value' => $item->name.', '.$item->country,
-                    'tokens' => '',
-                    'name' => null,
-                    'city' => $item->name,
-                    'country' => $item->country,
-                ];
-            });
-            // return $tags;
-        }
-        // });
-        $this->tokens['places'] = $tags;
-        $this->tokens['placesPagination'] = [
-            'total' => $hashtags->total(),
-            'current_page' => $hashtags->currentPage(),
-            'last_page' => $hashtags->lastPage(),
-        ];
-    }
+	public function results(Request $request)
+	{
+		$this->validate($request, [
+			'q' => 'required|string|min:1',
+		]);
 
-    protected function getProfiles()
-    {
-        $tag = $this->term;
-        $remoteKey = $this->cacheKey.'profiles:remote:'.$this->hash;
-        $key = $this->cacheKey.'profiles:'.$this->hash;
-        $remoteTtl = now()->addMinutes(15);
-        $ttl = now()->addHours(2);
-        if (Helpers::validateUrl($tag) != false &&
-            Helpers::validateLocalUrl($tag) != true &&
-            (bool) config_cache('federation.activitypub.enabled') == true &&
-            config('federation.activitypub.remoteFollow') == true
-        ) {
-            $remote = Helpers::fetchFromUrl($tag);
-            if (isset($remote['type']) &&
-                $remote['type'] == 'Person'
-            ) {
-                $this->tokens['profiles'] = Cache::remember($remoteKey, $remoteTtl, function () use ($tag) {
-                    $item = Helpers::profileFirstOrNew($tag);
-                    $tokens = [[
-                        'count' => 1,
-                        'url' => $item->url(),
-                        'type' => 'profile',
-                        'value' => $item->username,
-                        'tokens' => [$item->username],
-                        'name' => $item->name,
-                        'entity' => [
-                            'id' => (string) $item->id,
-                            'following' => $item->followedBy(Auth::user()->profile),
-                            'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
-                            'thumb' => $item->avatarUrl(),
-                            'local' => (bool) ! $item->domain,
-                            'post_count' => $item->statuses()->count(),
-                        ],
-                    ]];
+		return view('search.results');
+	}
 
-                    return $tokens;
-                });
-            }
-        } else {
-            $this->tokens['profiles'] = Cache::remember($key, $ttl, function () use ($tag) {
-                if (Str::startsWith($tag, '@')) {
-                    $tag = substr($tag, 1);
-                }
-                $users = Profile::select('status', 'domain', 'username', 'name', 'id')
-                    ->whereNull('status')
-                    ->where('username', 'like', '%'.$tag.'%')
-                    ->limit(20)
-                    ->orderBy('domain')
-                    ->get();
+	protected function webfingerSearch()
+	{
+		$wfs = WebfingerService::lookup($this->term);
 
-                if ($users->count() > 0) {
-                    return $users->map(function ($item, $key) {
-                        return [
-                            'count' => 0,
-                            'url' => $item->url(),
-                            'type' => 'profile',
-                            'value' => $item->username,
-                            'tokens' => [$item->username],
-                            'name' => $item->name,
-                            'avatar' => $item->avatarUrl(),
-                            'id' => (string) $item->id,
-                            'entity' => [
-                                'id' => (string) $item->id,
-                                'following' => $item->followedBy(Auth::user()->profile),
-                                'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id),
-                                'thumb' => $item->avatarUrl(),
-                                'local' => (bool) ! $item->domain,
-                                'post_count' => $item->statuses()->count(),
-                            ],
-                        ];
-                    });
-                }
-            });
-        }
-    }
+		if(empty($wfs)) {
+			return;
+		}
 
-    public function results(Request $request)
-    {
-        $this->validate($request, [
-            'q' => 'required|string|min:1',
-        ]);
+		$this->tokens['profiles'] = [
+			[
+				'count'  => 1,
+				'url'    => $wfs['url'],
+				'type'   => 'profile',
+				'value'  => $wfs['username'],
+				'tokens' => [$wfs['username']],
+				'name'   => $wfs['display_name'],
+				'entity' => [
+					'id' => (string) $wfs['id'],
+					'following' => null,
+					'follow_request' => null,
+					'thumb' => $wfs['avatar'],
+					'local' => (bool) $wfs['local']
+				]
+			]
+		];
+		return;
+	}
 
-        return view('search.results');
-    }
+	protected function remotePostLookup()
+	{
+		$tag = $this->term;
+		$hash = hash('sha256', $tag);
+		$local = Helpers::validateLocalUrl($tag);
+		$valid = Helpers::validateUrl($tag);
 
-    protected function webfingerSearch()
-    {
-        $wfs = WebfingerService::lookup($this->term);
+		if($valid == false || $local == true) {
+			return;
+		}
 
-        if (empty($wfs)) {
-            return;
-        }
+		if(Status::whereUri($tag)->whereLocal(false)->exists()) {
+			$item = Status::whereUri($tag)->first();
+			$media = $item->firstMedia();
+			$url = null;
+			if($media) {
+				$url = $media->remote_url;
+			}
+			$this->tokens['posts'] = [[
+				'count'  => 0,
+				'url'    => "/i/web/post/_/$item->profile_id/$item->id",
+				'type'   => 'status',
+				'username' => $item->profile->username,
+				'caption'   => $item->rendered ?? $item->caption,
+				'thumb'  => $url,
+				'timestamp' => $item->created_at->diffForHumans()
+			]];
+		}
 
-        $this->tokens['profiles'] = [
-            [
-                'count' => 1,
-                'url' => $wfs['url'],
-                'type' => 'profile',
-                'value' => $wfs['username'],
-                'tokens' => [$wfs['username']],
-                'name' => $wfs['display_name'],
-                'entity' => [
-                    'id' => (string) $wfs['id'],
-                    'following' => null,
-                    'follow_request' => null,
-                    'thumb' => $wfs['avatar'],
-                    'local' => (bool) $wfs['local'],
-                ],
-            ],
-        ];
+		$remote = Helpers::fetchFromUrl($tag);
 
-    }
+		if(isset($remote['type']) && $remote['type'] == 'Note') {
+			$item = Helpers::statusFetch($tag);
+			$media = $item->firstMedia();
+			$url = null;
+			if($media) {
+				$url = $media->remote_url;
+			}
+			$this->tokens['posts'] = [[
+				'count'  => 0,
+				'url'    => "/i/web/post/_/$item->profile_id/$item->id",
+				'type'   => 'status',
+				'username' => $item->profile->username,
+				'caption'   => $item->rendered ?? $item->caption,
+				'thumb'  => $url,
+				'timestamp' => $item->created_at->diffForHumans()
+			]];
+		}
+	}
 
-    protected function remotePostLookup()
-    {
-        $tag = $this->term;
-        $hash = hash('sha256', $tag);
-        $local = Helpers::validateLocalUrl($tag);
-        $valid = Helpers::validateUrl($tag);
-
-        if ($valid == false || $local == true) {
-            return;
-        }
-
-        if (Status::whereUri($tag)->whereLocal(false)->exists()) {
-            $item = Status::whereUri($tag)->first();
-            $media = $item->firstMedia();
-            $url = null;
-            if ($media) {
-                $url = $media->remote_url;
-            }
-            $this->tokens['posts'] = [[
-                'count' => 0,
-                'url' => "/i/web/post/_/$item->profile_id/$item->id",
-                'type' => 'status',
-                'username' => $item->profile->username,
-                'caption' => $item->rendered ?? $item->caption,
-                'thumb' => $url,
-                'timestamp' => $item->created_at->diffForHumans(),
-            ]];
-        }
-
-        $remote = Helpers::fetchFromUrl($tag);
-
-        if (isset($remote['type']) && $remote['type'] == 'Note') {
-            $item = Helpers::statusFetch($tag);
-            $media = $item->firstMedia();
-            $url = null;
-            if ($media) {
-                $url = $media->remote_url;
-            }
-            $this->tokens['posts'] = [[
-                'count' => 0,
-                'url' => "/i/web/post/_/$item->profile_id/$item->id",
-                'type' => 'status',
-                'username' => $item->profile->username,
-                'caption' => $item->rendered ?? $item->caption,
-                'thumb' => $url,
-                'timestamp' => $item->created_at->diffForHumans(),
-            ]];
-        }
-    }
-
-    protected function remoteLookupSearch()
-    {
-        if (! Helpers::validateUrl($this->term)) {
-            return;
-        }
-        $this->getProfiles();
-        $this->remotePostLookup();
-    }
+	protected function remoteLookupSearch()
+	{
+		if(!Helpers::validateUrl($this->term)) {
+			return;
+		}
+		$this->getProfiles();
+		$this->remotePostLookup();
+	}
 }

app/Http/Controllers/Settings/HomeSettings.php

@@ -22,189 +22,189 @@ use App\Services\PronounService;
 
 trait HomeSettings
 {
-    public function home()
-    {
-        $id = Auth::user()->profile->id;
-        $storage = [];
-        $used = Media::whereProfileId($id)->sum('size');
-        $storage['limit'] = config_cache('pixelfed.max_account_size') * 1024;
-        $storage['used'] = $used;
-        $storage['percentUsed'] = ceil($storage['used'] / $storage['limit'] * 100);
-        $storage['limitPretty'] = PrettyNumber::size($storage['limit']);
-        $storage['usedPretty'] = PrettyNumber::size($storage['used']);
-        $pronouns = PronounService::get($id);
+	public function home()
+	{
+		$id = Auth::user()->profile->id;
+		$storage = [];
+		$used = Media::whereProfileId($id)->sum('size');
+		$storage['limit'] = config_cache('pixelfed.max_account_size') * 1024;
+		$storage['used'] = $used;
+		$storage['percentUsed'] = ceil($storage['used'] / $storage['limit'] * 100);
+		$storage['limitPretty'] = PrettyNumber::size($storage['limit']);
+		$storage['usedPretty'] = PrettyNumber::size($storage['used']);
+		$pronouns = PronounService::get($id);
 
-        return view('settings.home', compact('storage', 'pronouns'));
-    }
+		return view('settings.home', compact('storage', 'pronouns'));
+	}
 
-    public function homeUpdate(Request $request)
-    {
-        $this->validate($request, [
-            'name'    => 'nullable|string|max:'.config('pixelfed.max_name_length'),
-            'bio'     => 'nullable|string|max:'.config('pixelfed.max_bio_length'),
-            'website' => 'nullable|url',
-            'language' => 'nullable|string|min:2|max:5',
-            'pronouns' => 'nullable|array|max:4'
-        ]);
+	public function homeUpdate(Request $request)
+	{
+		$this->validate($request, [
+			'name'    => 'nullable|string|max:'.config('pixelfed.max_name_length'),
+			'bio'     => 'nullable|string|max:'.config('pixelfed.max_bio_length'),
+			'website' => 'nullable|url',
+			'language' => 'nullable|string|min:2|max:5',
+			'pronouns' => 'nullable|array|max:4'
+		]);
 
-        $changes = false;
-        $name = strip_tags(Purify::clean($request->input('name')));
-        $bio = $request->filled('bio') ? strip_tags(Purify::clean($request->input('bio'))) : null;
-        $website = $request->input('website');
-        $language = $request->input('language');
-        $user = Auth::user();
-        $profile = $user->profile;
-        $pronouns = $request->input('pronouns');
-        $existingPronouns = PronounService::get($profile->id);
-        $layout = $request->input('profile_layout');
-        if($layout) {
-            $layout = !in_array($layout, ['metro', 'moment']) ? 'metro' : $layout;
-        }
+		$changes = false;
+		$name = strip_tags(Purify::clean($request->input('name')));
+		$bio = $request->filled('bio') ? strip_tags(Purify::clean($request->input('bio'))) : null;
+		$website = $request->input('website');
+		$language = $request->input('language');
+		$user = Auth::user();
+		$profile = $user->profile;
+		$pronouns = $request->input('pronouns');
+		$existingPronouns = PronounService::get($profile->id);
+		$layout = $request->input('profile_layout');
+		if($layout) {
+			$layout = !in_array($layout, ['metro', 'moment']) ? 'metro' : $layout;
+		}
 
-        $enforceEmailVerification = config_cache('pixelfed.enforce_email_verification');
+		$enforceEmailVerification = config_cache('pixelfed.enforce_email_verification');
 
-        // Only allow email to be updated if not yet verified
-        if (!$enforceEmailVerification || !$changes && $user->email_verified_at) {
-            if ($profile->name != $name) {
-                $changes = true;
-                $user->name = $name;
-                $profile->name = $name;
-            }
+		// Only allow email to be updated if not yet verified
+		if (!$enforceEmailVerification || !$changes && $user->email_verified_at) {
+			if ($profile->name != $name) {
+				$changes = true;
+				$user->name = $name;
+				$profile->name = $name;
+			}
 
-            if ($profile->website != $website) {
-                $changes = true;
-                $profile->website = $website;
-            }
+			if ($profile->website != $website) {
+				$changes = true;
+				$profile->website = $website;
+			}
 
-            if (strip_tags($profile->bio) != $bio) {
-                $changes = true;
-                $profile->bio = Autolink::create()->autolink($bio);
-            }
+			if (strip_tags($profile->bio) != $bio) {
+				$changes = true;
+				$profile->bio = Autolink::create()->autolink($bio);
+			}
 
-            if($user->language != $language &&
-                in_array($language, \App\Util\Localization\Localization::languages())
-            ) {
-                $changes = true;
-                $user->language = $language;
-                session()->put('locale', $language);
-            }
+			if($user->language != $language &&
+				in_array($language, \App\Util\Localization\Localization::languages())
+			) {
+				$changes = true;
+				$user->language = $language;
+				session()->put('locale', $language);
+			}
 
-            if($existingPronouns != $pronouns) {
-                if($pronouns && in_array('Select Pronoun(s)', $pronouns)) {
-                    PronounService::clear($profile->id);
-                } else {
-                    PronounService::put($profile->id, $pronouns);
-                }
-            }
-        }
+			if($existingPronouns != $pronouns) {
+				if($pronouns && in_array('Select Pronoun(s)', $pronouns)) {
+					PronounService::clear($profile->id);
+				} else {
+					PronounService::put($profile->id, $pronouns);
+				}
+			}
+		}
 
-        if ($changes === true) {
-            $user->save();
-            $profile->save();
-            Cache::forget('user:account:id:'.$user->id);
-            AccountService::del($profile->id);
-            return redirect('/settings/home')->with('status', 'Profile successfully updated!');
-        }
+		if ($changes === true) {
+			$user->save();
+			$profile->save();
+			Cache::forget('user:account:id:'.$user->id);
+			AccountService::del($profile->id);
+			return redirect('/settings/home')->with('status', 'Profile successfully updated!');
+		}
 
-        return redirect('/settings/home');
-    }
+		return redirect('/settings/home');
+	}
 
-    public function password()
-    {
-        return view('settings.password');
-    }
+	public function password()
+	{
+		return view('settings.password');
+	}
 
-    public function passwordUpdate(Request $request)
-    {
-        $this->validate($request, [
-        'current'                => 'required|string',
-        'password'               => 'required|string',
-        'password_confirmation'  => 'required|string',
-      ]);
+	public function passwordUpdate(Request $request)
+	{
+		$this->validate($request, [
+		'current'                => 'required|string',
+		'password'               => 'required|string',
+		'password_confirmation'  => 'required|string',
+	  ]);
 
-        $current = $request->input('current');
-        $new = $request->input('password');
-        $confirm = $request->input('password_confirmation');
+		$current = $request->input('current');
+		$new = $request->input('password');
+		$confirm = $request->input('password_confirmation');
 
-        $user = Auth::user();
+		$user = Auth::user();
 
-        if (password_verify($current, $user->password) && $new === $confirm) {
-            $user->password = bcrypt($new);
-            $user->save();
+		if (password_verify($current, $user->password) && $new === $confirm) {
+			$user->password = bcrypt($new);
+			$user->save();
 
-            $log = new AccountLog();
-            $log->user_id = $user->id;
-            $log->item_id = $user->id;
-            $log->item_type = 'App\User';
-            $log->action = 'account.edit.password';
-            $log->message = 'Password changed';
-            $log->link = null;
-            $log->ip_address = $request->ip();
-            $log->user_agent = $request->userAgent();
-            $log->save();
+			$log = new AccountLog();
+			$log->user_id = $user->id;
+			$log->item_id = $user->id;
+			$log->item_type = 'App\User';
+			$log->action = 'account.edit.password';
+			$log->message = 'Password changed';
+			$log->link = null;
+			$log->ip_address = $request->ip();
+			$log->user_agent = $request->userAgent();
+			$log->save();
 
-            Mail::to($request->user())->send(new PasswordChange($user));
-            return redirect('/settings/home')->with('status', 'Password successfully updated!');
-        } else {
-            return redirect()->back()->with('error', 'There was an error with your request! Please try again.');
-        }
+			Mail::to($request->user())->send(new PasswordChange($user));
+			return redirect('/settings/home')->with('status', 'Password successfully updated!');
+		} else {
+			return redirect()->back()->with('error', 'There was an error with your request! Please try again.');
+		}
 
-    }
+	}
 
-    public function email()
-    {
-        return view('settings.email');
-    }
+	public function email()
+	{
+		return view('settings.email');
+	}
 
-    public function emailUpdate(Request $request)
-    {
-        $this->validate($request, [
-            'email'   => 'required|email|unique:users,email',
-        ]);
-        $changes = false;
-        $email = $request->input('email');
-        $user = Auth::user();
-        $profile = $user->profile;
+	public function emailUpdate(Request $request)
+	{
+		$this->validate($request, [
+			'email'   => 'required|email|unique:users,email',
+		]);
+		$changes = false;
+		$email = $request->input('email');
+		$user = Auth::user();
+		$profile = $user->profile;
 
-        $validate = config_cache('pixelfed.enforce_email_verification');
+		$validate = config_cache('pixelfed.enforce_email_verification');
 
-        if ($user->email != $email) {
-            $changes = true;
-            $user->email = $email;
+		if ($user->email != $email) {
+			$changes = true;
+			$user->email = $email;
 
-            if ($validate) {
-                // auto verify admin email addresses
-                $user->email_verified_at = $user->is_admin == true ? now() : null;
-                // Prevent old verifications from working
-                EmailVerification::whereUserId($user->id)->delete();
-            }
+			if ($validate) {
+				$user->email_verified_at = null;
+				// Prevent old verifications from working
+				EmailVerification::whereUserId($user->id)->delete();
+			}
 
-            $log = new AccountLog();
-            $log->user_id = $user->id;
-            $log->item_id = $user->id;
-            $log->item_type = 'App\User';
-            $log->action = 'account.edit.email';
-            $log->message = 'Email changed';
-            $log->link = null;
-            $log->ip_address = $request->ip();
-            $log->user_agent = $request->userAgent();
-            $log->save();
-        }
+			$log = new AccountLog();
+			$log->user_id = $user->id;
+			$log->item_id = $user->id;
+			$log->item_type = 'App\User';
+			$log->action = 'account.edit.email';
+			$log->message = 'Email changed';
+			$log->link = null;
+			$log->ip_address = $request->ip();
+			$log->user_agent = $request->userAgent();
+			$log->save();
+		}
 
-        if ($changes === true) {
-            Cache::forget('user:account:id:'.$user->id);
-            $user->save();
-            $profile->save();
+		if ($changes === true) {
+			Cache::forget('user:account:id:'.$user->id);
+			$user->save();
+			$profile->save();
 
-            return redirect('/settings/email')->with('status', 'Email successfully updated!');
-        } else {
-            return redirect('/settings/email');
-        }
+			return redirect('/settings/home')->with('status', 'Email successfully updated!');
+		} else {
+			return redirect('/settings/email');
+		}
 
-    }
+	}
+
+	public function avatar()
+	{
+		return view('settings.avatar');
+	}
 
-    public function avatar()
-    {
-        return view('settings.avatar');
-    }
 }

app/Http/Controllers/Settings/PrivacySettings.php

@@ -2,26 +2,31 @@
 
 namespace App\Http\Controllers\Settings;
 
+use App\AccountLog;
+use App\EmailVerification;
+use App\Instance;
 use App\Follower;
+use App\Media;
 use App\Profile;
-use App\Services\RelationshipService;
+use App\User;
 use App\UserFilter;
-use Auth;
-use Cache;
-use DB;
+use App\Util\Lexer\PrettyNumber;
+use App\Util\ActivityPub\Helpers;
+use Auth, Cache, DB;
 use Illuminate\Http\Request;
 
 trait PrivacySettings
 {
+
     public function privacy()
     {
-        $user = Auth::user();
-        $settings = $user->settings;
-        $profile = $user->profile;
-        $is_private = $profile->is_private;
-        $settings['is_private'] = (bool) $is_private;
+		$user = Auth::user();
+		$settings = $user->settings;
+		$profile = $user->profile;
+		$is_private = $profile->is_private;
+		$settings['is_private'] = (bool) $is_private;
 
-        return view('settings.privacy', compact('settings', 'profile'));
+		return view('settings.privacy', compact('settings', 'profile'));
     }
 
     public function privacyStore(Request $request)
@@ -29,18 +34,16 @@ trait PrivacySettings
         $settings = $request->user()->settings;
         $profile = $request->user()->profile;
         $fields = [
-            'is_private',
-            'crawlable',
-            'public_dm',
-            'show_profile_follower_count',
-            'show_profile_following_count',
-            'indexable',
-            'show_atom',
+          'is_private',
+          'crawlable',
+          'public_dm',
+          'show_profile_follower_count',
+          'show_profile_following_count',
+          'show_atom',
         ];
 
-        $profile->indexable = $request->input('indexable') == 'on';
-        $profile->is_suggestable = $request->input('is_suggestable') == 'on';
-        $profile->save();
+		$profile->is_suggestable = $request->input('is_suggestable') == 'on';
+		$profile->save();
 
         foreach ($fields as $field) {
             $form = $request->input($field);
@@ -61,14 +64,12 @@ trait PrivacySettings
                 } else {
                     $settings->{$field} = true;
                 }
-            } elseif ($field == 'public_dm') {
+             } elseif ($field == 'public_dm') {
                 if ($form == 'on') {
                     $settings->{$field} = true;
                 } else {
                     $settings->{$field} = false;
                 }
-            } elseif ($field == 'indexable') {
-
             } else {
                 if ($form == 'on') {
                     $settings->{$field} = true;
@@ -78,36 +79,29 @@ trait PrivacySettings
             }
             $settings->save();
         }
-        $pid = $profile->id;
-        Cache::forget('profile:settings:'.$pid);
-        Cache::forget('user:account:id:'.$profile->user_id);
-        Cache::forget('profile:follower_count:'.$pid);
-        Cache::forget('profile:following_count:'.$pid);
-        Cache::forget('profile:atom:enabled:'.$pid);
-        Cache::forget('profile:embed:'.$pid);
-        Cache::forget('pf:acct:settings:hidden-followers:'.$pid);
-        Cache::forget('pf:acct:settings:hidden-following:'.$pid);
-        Cache::forget('pf:acct-trans:hideFollowing:'.$pid);
-        Cache::forget('pf:acct-trans:hideFollowers:'.$pid);
-        Cache::forget('pfc:cached-user:wt:'.strtolower($profile->username));
-        Cache::forget('pfc:cached-user:wot:'.strtolower($profile->username));
-
+        Cache::forget('profile:settings:' . $profile->id);
+        Cache::forget('user:account:id:' . $profile->user_id);
+        Cache::forget('profile:follower_count:' . $profile->id);
+        Cache::forget('profile:following_count:' . $profile->id);
+        Cache::forget('profile:atom:enabled:' . $profile->id);
+        Cache::forget('profile:embed:' . $profile->id);
+        Cache::forget('pf:acct:settings:hidden-followers:' . $profile->id);
+        Cache::forget('pf:acct:settings:hidden-following:' . $profile->id);
         return redirect(route('settings.privacy'))->with('status', 'Settings successfully updated!');
     }
 
     public function mutedUsers()
-    {
+    {   
         $pid = Auth::user()->profile->id;
         $ids = (new UserFilter())->mutedUserIds($pid);
         $users = Profile::whereIn('id', $ids)->simplePaginate(15);
-
         return view('settings.privacy.muted', compact('users'));
     }
 
     public function mutedUsersUpdate(Request $request)
-    {
+    {   
         $this->validate($request, [
-            'profile_id' => 'required|integer|min:1',
+            'profile_id' => 'required|integer|min:1'
         ]);
         $fid = $request->input('profile_id');
         $pid = Auth::user()->profile->id;
@@ -119,8 +113,6 @@ trait PrivacySettings
                 ->firstOrFail();
             $filter->delete();
         });
-        RelationshipService::refresh($pid, $fid);
-
         return redirect()->back();
     }
 
@@ -129,14 +121,14 @@ trait PrivacySettings
         $pid = Auth::user()->profile->id;
         $ids = (new UserFilter())->blockedUserIds($pid);
         $users = Profile::whereIn('id', $ids)->simplePaginate(15);
-
         return view('settings.privacy.blocked', compact('users'));
     }
 
+
     public function blockedUsersUpdate(Request $request)
-    {
+    {   
         $this->validate($request, [
-            'profile_id' => 'required|integer|min:1',
+            'profile_id' => 'required|integer|min:1'
         ]);
         $fid = $request->input('profile_id');
         $pid = Auth::user()->profile->id;
@@ -148,32 +140,52 @@ trait PrivacySettings
                 ->firstOrFail();
             $filter->delete();
         });
-        RelationshipService::refresh($pid, $fid);
-
         return redirect()->back();
     }
 
     public function blockedInstances()
     {
-        // deprecated
-        abort(404);
-    }
-
-    public function domainBlocks()
-    {
-        return view('settings.privacy.domain-blocks');
+        $pid = Auth::user()->profile->id;
+        $filters = UserFilter::whereUserId($pid)
+            ->whereFilterableType('App\Instance')
+            ->whereFilterType('block')
+            ->orderByDesc('id')
+            ->paginate(10);
+        return view('settings.privacy.blocked-instances', compact('filters'));
     }
 
     public function blockedInstanceStore(Request $request)
     {
-        // deprecated
-        abort(404);
+        $this->validate($request, [
+            'domain' => 'required|url|min:1|max:120'
+        ]);
+        $domain = $request->input('domain');
+        if(Helpers::validateUrl($domain) == false) {
+            return abort(400, 'Invalid domain');
+        }
+        $domain = parse_url($domain, PHP_URL_HOST);
+        $instance = Instance::firstOrCreate(['domain' => $domain]);
+        $filter = new UserFilter;
+        $filter->user_id = Auth::user()->profile->id;
+        $filter->filterable_id = $instance->id;
+        $filter->filterable_type = 'App\Instance';
+        $filter->filter_type = 'block';
+        $filter->save();
+        return response()->json(['msg' => 200]);
     }
 
     public function blockedInstanceUnblock(Request $request)
     {
-        // deprecated
-        abort(404);
+        $this->validate($request, [
+            'id'    => 'required|integer|min:1'
+        ]);
+        $pid = Auth::user()->profile->id;
+
+        $filter = UserFilter::whereFilterableType('App\Instance')
+            ->whereUserId($pid)
+            ->findOrFail($request->input('id'));
+        $filter->delete();
+        return redirect(route('settings.privacy.blocked-instances'));
     }
 
     public function blockedKeywords()
@@ -194,7 +206,7 @@ trait PrivacySettings
         $profile = Auth::user()->profile;
         $settings = Auth::user()->settings;
 
-        if ($mode !== 'keep-all') {
+        if($mode !== 'keep-all') {
             switch ($mode) {
                 case 'mutual-only':
                     $following = $profile->following()->pluck('profiles.id');
@@ -209,9 +221,9 @@ trait PrivacySettings
                 case 'remove-all':
                     Follower::whereFollowingId($profile->id)->delete();
                     break;
-
+                
                 default:
-                    // code...
+                    # code...
                     break;
             }
         }
@@ -221,7 +233,6 @@ trait PrivacySettings
         $settings->save();
         $profile->save();
         Cache::forget('profiles:private');
-
         return [200];
     }
 }

app/Http/Controllers/SettingsController.php

@@ -230,51 +230,29 @@ class SettingsController extends Controller
 
 	public function timelineSettings(Request $request)
 	{
-        $uid = $request->user()->id;
 		$pid = $request->user()->profile_id;
 		$top = Redis::zscore('pf:tl:top', $pid) != false;
 		$replies = Redis::zscore('pf:tl:replies', $pid) != false;
-        $userSettings = UserSetting::firstOrCreate([
-            'user_id' => $uid
-        ]);
-        if(!$userSettings || !$userSettings->other) {
-            $userSettings = [
-                'enable_reblogs' => false,
-                'photo_reblogs_only' => false
-            ];
-        } else {
-            $userSettings = array_merge([
-                'enable_reblogs' => false,
-                'photo_reblogs_only' => false
-            ],
-            $userSettings->other);
-        }
-		return view('settings.timeline', compact('top', 'replies', 'userSettings'));
+		return view('settings.timeline', compact('top', 'replies'));
 	}
 
 	public function updateTimelineSettings(Request $request)
 	{
-        $pid = $request->user()->profile_id;
-		$uid = $request->user()->id;
-        $this->validate($request, [
-            'enable_reblogs' => 'sometimes',
-            'photo_reblogs_only' => 'sometimes'
-        ]);
-		Redis::zrem('pf:tl:top', $pid);
-		Redis::zrem('pf:tl:replies', $pid);
-        $userSettings = UserSetting::firstOrCreate([
-            'user_id' => $uid
-        ]);
-		if($userSettings->other) {
-            $other = $userSettings->other;
-            $other['enable_reblogs'] = $request->has('enable_reblogs');
-            $other['photo_reblogs_only'] = $request->has('photo_reblogs_only');
-        } else {
-            $other['enable_reblogs'] = $request->has('enable_reblogs');
-            $other['photo_reblogs_only'] = $request->has('photo_reblogs_only');
-        }
-        $userSettings->other = $other;
-        $userSettings->save();
+		$pid = $request->user()->profile_id;
+		$top = $request->has('top') && $request->input('top') === 'on';
+		$replies = $request->has('replies') && $request->input('replies') === 'on';
+
+		if($top) {
+			Redis::zadd('pf:tl:top', $pid, $pid);
+		} else {
+			Redis::zrem('pf:tl:top', $pid);
+		}
+
+		if($replies) {
+			Redis::zadd('pf:tl:replies', $pid, $pid);
+		} else {
+			Redis::zrem('pf:tl:replies', $pid);
+		}
 		return redirect(route('settings'))->with('status', 'Timeline settings successfully updated!');
 	}
 

app/Http/Controllers/SiteController.php

@@ -2,202 +2,175 @@
 
 namespace App\Http\Controllers;
 
-use App\Page;
-use App\Profile;
-use App\Services\FollowerService;
-use App\Status;
-use App\User;
-use App\Util\ActivityPub\Helpers;
-use App\Util\Localization\Localization;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
-use View;
+use App, Auth, Cache, View;
+use App\Util\Lexer\PrettyNumber;
+use App\{Follower, Page, Profile, Status, User, UserFilter};
+use App\Util\Localization\Localization;
+use App\Services\FollowerService;
+use App\Util\ActivityPub\Helpers;
 
 class SiteController extends Controller
 {
-    public function home(Request $request)
-    {
-        if (Auth::check()) {
-            return $this->homeTimeline($request);
-        } else {
-            return $this->homeGuest();
-        }
-    }
+	public function home(Request $request)
+	{
+		if (Auth::check()) {
+			return $this->homeTimeline($request);
+		} else {
+			return $this->homeGuest();
+		}
+	}
 
-    public function homeGuest()
-    {
-        return view('site.index');
-    }
+	public function homeGuest()
+	{
+		return view('site.index');
+	}
 
-    public function homeTimeline(Request $request)
-    {
-        if ($request->has('force_old_ui')) {
-            return view('timeline.home', ['layout' => 'feed']);
-        }
+	public function homeTimeline(Request $request)
+	{
+		if($request->has('force_old_ui')) {
+			return view('timeline.home', ['layout' => 'feed']);
+		}
 
-        return redirect('/i/web');
-    }
+		return redirect('/i/web');
+	}
 
-    public function changeLocale(Request $request, $locale)
-    {
-        // todo: add other locales after pushing new l10n strings
-        $locales = Localization::languages();
-        if (in_array($locale, $locales)) {
-            if ($request->user()) {
-                $user = $request->user();
-                $user->language = $locale;
-                $user->save();
-            }
-            session()->put('locale', $locale);
-        }
+	public function changeLocale(Request $request, $locale)
+	{
+		// todo: add other locales after pushing new l10n strings
+		$locales = Localization::languages();
+		if(in_array($locale, $locales)) {
+			if($request->user()) {
+				$user = $request->user();
+				$user->language = $locale;
+				$user->save();
+			}
+		  session()->put('locale', $locale);
+		}
 
-        return redirect(route('site.language'));
-    }
+		return redirect(route('site.language'));
+	}
 
-    public function about()
-    {
-        return Cache::remember('site.about_v2', now()->addMinutes(15), function () {
-            $user_count = number_format(User::count());
-            $post_count = number_format(Status::count());
-            $rules = config_cache('app.rules') ? json_decode(config_cache('app.rules'), true) : null;
+	public function about()
+	{
+		return Cache::remember('site.about_v2', now()->addMinutes(15), function() {
+			$user_count = number_format(User::count());
+			$post_count = number_format(Status::count());
+			$rules = config_cache('app.rules') ? json_decode(config_cache('app.rules'), true) : null;
+			return view('site.about', compact('rules', 'user_count', 'post_count'))->render();
+		});
+	}
 
-            return view('site.about', compact('rules', 'user_count', 'post_count'))->render();
-        });
-    }
+	public function language()
+	{
+	  return view('site.language');
+	}
 
-    public function language()
-    {
-        return view('site.language');
-    }
+	public function communityGuidelines(Request $request)
+	{
+		return Cache::remember('site:help:community-guidelines', now()->addDays(120), function() {
+			$slug = '/site/kb/community-guidelines';
+			$page = Page::whereSlug($slug)->whereActive(true)->first();
+			return View::make('site.help.community-guidelines')->with(compact('page'))->render();
+		});
+	}
 
-    public function communityGuidelines(Request $request)
-    {
-        return Cache::remember('site:help:community-guidelines', now()->addDays(120), function () {
-            $slug = '/site/kb/community-guidelines';
-            $page = Page::whereSlug($slug)->whereActive(true)->first();
+	public function privacy(Request $request)
+	{
+		$page = Cache::remember('site:privacy', now()->addDays(120), function() {
+			$slug = '/site/privacy';
+			return Page::whereSlug($slug)->whereActive(true)->first();
+		});
+		return View::make('site.privacy')->with(compact('page'))->render();
+	}
 
-            return View::make('site.help.community-guidelines')->with(compact('page'))->render();
-        });
-    }
+	public function terms(Request $request)
+	{
+		$page = Cache::remember('site:terms', now()->addDays(120), function() {
+			$slug = '/site/terms';
+			return Page::whereSlug($slug)->whereActive(true)->first();
+		});
+		return View::make('site.terms')->with(compact('page'))->render();
+	}
 
-    public function privacy(Request $request)
-    {
-        $page = Cache::remember('site:privacy', now()->addDays(120), function () {
-            $slug = '/site/privacy';
+	public function legal(Request $request)
+	{
+		$page = Cache::remember('site:terms', now()->addDays(120), function() {
+			$slug = '/site/legal';
+			return Page::whereSlug($slug)->whereActive(true)->first();
+		});
+		return View::make('site.legal')->with(compact('page'))->render();
+	}
 
-            return Page::whereSlug($slug)->whereActive(true)->first();
-        });
+	public function redirectUrl(Request $request)
+	{
+		abort_if(!$request->user(), 404);
+		$this->validate($request, [
+			'url' => 'required|url'
+		]);
+		$url = request()->input('url');
+		abort_if(Helpers::validateUrl($url) == false, 404);
+		return view('site.redirect', compact('url'));
+	}
 
-        return View::make('site.privacy')->with(compact('page'))->render();
-    }
+	public function followIntent(Request $request)
+	{
+		$this->validate($request, [
+			'user' => 'string|min:1|max:15|exists:users,username',
+		]);
+		$profile = Profile::whereUsername($request->input('user'))->firstOrFail();
+		$user = $request->user();
+		abort_if($user && $profile->id == $user->profile_id, 404);
+		$following = $user != null ? FollowerService::follows($user->profile_id, $profile->id) : false;
+		return view('site.intents.follow', compact('profile', 'user', 'following'));
+	}
 
-    public function terms(Request $request)
-    {
-        $page = Cache::remember('site:terms', now()->addDays(120), function () {
-            $slug = '/site/terms';
+	public function legacyProfileRedirect(Request $request, $username)
+	{
+		$username = Str::contains($username, '@') ? '@' . $username : $username;
+		if(str_contains($username, '@')) {
+			$profile = Profile::whereUsername($username)
+				->firstOrFail();
 
-            return Page::whereSlug($slug)->whereActive(true)->first();
-        });
+			if($profile->domain == null) {
+				$url = "/$profile->username";
+			} else {
+				$url = "/i/web/profile/_/{$profile->id}";
+			}
 
-        return View::make('site.terms')->with(compact('page'))->render();
-    }
+		} else {
+			$profile = Profile::whereUsername($username)
+				->whereNull('domain')
+				->firstOrFail();
+			$url = "/$profile->username";
+		}
 
-    public function redirectUrl(Request $request)
-    {
-        abort_if(! $request->user(), 404);
-        $this->validate($request, [
-            'url' => 'required|url',
-        ]);
-        $url = request()->input('url');
-        abort_if(Helpers::validateUrl($url) == false, 404);
+		return redirect($url);
+	}
 
-        return view('site.redirect', compact('url'));
-    }
+	public function legacyWebfingerRedirect(Request $request, $username, $domain)
+	{
+		$un = '@'.$username.'@'.$domain;
+		$profile = Profile::whereUsername($un)
+			->firstOrFail();
 
-    public function followIntent(Request $request)
-    {
-        $this->validate($request, [
-            'user' => 'string|min:1|max:15|exists:users,username',
-        ]);
-        $profile = Profile::whereUsername($request->input('user'))->firstOrFail();
-        $user = $request->user();
-        abort_if($user && $profile->id == $user->profile_id, 404);
-        $following = $user != null ? FollowerService::follows($user->profile_id, $profile->id) : false;
+		if($profile->domain == null) {
+			$url = "/$profile->username";
+		} else {
+			$url = $request->user() ? "/i/web/profile/_/{$profile->id}" : $profile->url();
+		}
 
-        return view('site.intents.follow', compact('profile', 'user', 'following'));
-    }
+		return redirect($url);
+	}
 
-    public function legacyProfileRedirect(Request $request, $username)
-    {
-        $username = Str::contains($username, '@') ? '@'.$username : $username;
-        if (str_contains($username, '@')) {
-            $profile = Profile::whereUsername($username)
-                ->firstOrFail();
-
-            if ($profile->domain == null) {
-                $url = "/$profile->username";
-            } else {
-                $url = "/i/web/profile/_/{$profile->id}";
-            }
-
-        } else {
-            $profile = Profile::whereUsername($username)
-                ->whereNull('domain')
-                ->firstOrFail();
-            $url = "/$profile->username";
-        }
-
-        return redirect($url);
-    }
-
-    public function legacyWebfingerRedirect(Request $request, $username, $domain)
-    {
-        $un = '@'.$username.'@'.$domain;
-        $profile = Profile::whereUsername($un)
-            ->firstOrFail();
-
-        if ($profile->domain == null) {
-            $url = "/$profile->username";
-        } else {
-            $url = $request->user() ? "/i/web/profile/_/{$profile->id}" : $profile->url();
-        }
-
-        return redirect($url);
-    }
-
-    public function legalNotice(Request $request)
-    {
-        $page = Cache::remember('site:legal-notice', now()->addDays(120), function () {
-            $slug = '/site/legal-notice';
-
-            return Page::whereSlug($slug)->whereActive(true)->first();
-        });
-        abort_if(! $page, 404);
-
-        return View::make('site.legal-notice')->with(compact('page'))->render();
-    }
-
-    public function curatedOnboarding(Request $request)
-    {
-        if ($request->user()) {
-            return redirect('/i/web');
-        }
-
-        $regOpen = (bool) config_cache('pixelfed.open_registration');
-        $curOnboarding = (bool) config_cache('instance.curated_registration.enabled');
-        $curOnlyClosed = (bool) config('instance.curated_registration.state.only_enabled_on_closed_reg');
-        if ($regOpen) {
-            if ($curOnlyClosed) {
-                return redirect('/register');
-            }
-        } else {
-            if (! $curOnboarding) {
-                return redirect('/');
-            }
-        }
-
-        return view('auth.curated-register.index', ['step' => 1]);
-    }
+	public function legalNotice(Request $request)
+	{
+		$page = Cache::remember('site:legal-notice', now()->addDays(120), function() {
+			$slug = '/site/legal-notice';
+			return Page::whereSlug($slug)->whereActive(true)->first();
+		});
+		abort_if(!$page, 404);
+		return View::make('site.legal-notice')->with(compact('page'))->render();
+	}
 }

app/Http/Controllers/SoftwareUpdateController.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Services\Internal\SoftwareUpdateService;
-
-class SoftwareUpdateController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware('auth');
-        $this->middleware('admin');
-    }
-
-    public function getSoftwareUpdateCheck(Request $request)
-    {
-        $res = SoftwareUpdateService::get();
-        return $res;
-    }
-}

app/Http/Controllers/StatusController.php

@@ -2,486 +2,457 @@
 
 namespace App\Http\Controllers;
 
-use App\AccountInterstitial;
+use App\Jobs\ImageOptimizePipeline\ImageOptimize;
+use App\Jobs\StatusPipeline\NewStatusPipeline;
+use App\Jobs\StatusPipeline\StatusDelete;
 use App\Jobs\SharePipeline\SharePipeline;
 use App\Jobs\SharePipeline\UndoSharePipeline;
-use App\Jobs\StatusPipeline\RemoteStatusDelete;
-use App\Jobs\StatusPipeline\StatusDelete;
+use App\AccountInterstitial;
+use App\Media;
 use App\Profile;
-use App\Services\AccountService;
-use App\Services\HashidService;
-use App\Services\ReblogService;
-use App\Services\StatusService;
 use App\Status;
+use App\StatusArchived;
 use App\StatusView;
+use App\Transformer\ActivityPub\StatusTransformer;
 use App\Transformer\ActivityPub\Verb\Note;
 use App\Transformer\ActivityPub\Verb\Question;
-use App\Util\Media\License;
-use Auth;
-use Cache;
-use DB;
+use App\User;
+use Auth, DB, Cache;
 use Illuminate\Http\Request;
 use League\Fractal;
+use App\Util\Media\Filter;
+use Illuminate\Support\Str;
+use App\Services\HashidService;
+use App\Services\StatusService;
+use App\Util\Media\License;
+use App\Services\ReblogService;
 
 class StatusController extends Controller
 {
-    public function show(Request $request, $username, $id)
-    {
-        // redirect authed users to Metro 2.0
-        if ($request->user()) {
-            // unless they force static view
-            if (! $request->has('fs') || $request->input('fs') != '1') {
-                return redirect('/i/web/post/'.$id);
-            }
-        }
-
-        $user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
-
-        if ($user->status != null) {
-            return ProfileController::accountCheck($user);
-        }
-
-        $status = Status::whereProfileId($user->id)
-            ->whereNull('reblog_of_id')
-            ->whereIn('scope', ['public', 'unlisted', 'private'])
-            ->findOrFail($id);
-
-        if ($status->uri || $status->url) {
-            $url = $status->uri ?? $status->url;
-            if (ends_with($url, '/activity')) {
-                $url = str_replace('/activity', '', $url);
-            }
-
-            return redirect($url);
-        }
-
-        if ($status->visibility == 'private' || $user->is_private) {
-            if (! Auth::check()) {
-                abort(404);
-            }
-            $pid = Auth::user()->profile;
-            if ($user->followedBy($pid) == false && $user->id !== $pid->id && Auth::user()->is_admin == false) {
-                abort(404);
-            }
-        }
-
-        if ($status->type == 'archived') {
-            if (Auth::user()->profile_id !== $status->profile_id) {
-                abort(404);
-            }
-        }
-
-        if ($request->user() && $request->user()->profile_id != $status->profile_id) {
-            StatusView::firstOrCreate([
-                'status_id' => $status->id,
-                'status_profile_id' => $status->profile_id,
-                'profile_id' => $request->user()->profile_id,
-            ]);
-        }
-
-        if ($request->wantsJson() && (bool) config_cache('federation.activitypub.enabled')) {
-            return $this->showActivityPub($request, $status);
-        }
-
-        $template = $status->in_reply_to_id ? 'status.reply' : 'status.show';
-
-        return view($template, compact('user', 'status'));
-    }
-
-    public function shortcodeRedirect(Request $request, $id)
-    {
-        $hid = HashidService::decode($id);
-        abort_if(! $hid, 404);
-
-        return redirect('/i/web/post/'.$hid);
-    }
-
-    public function showId(int $id)
-    {
-        abort(404);
-        $status = Status::whereNull('reblog_of_id')
-            ->whereIn('scope', ['public', 'unlisted'])
-            ->findOrFail($id);
-
-        return redirect($status->url());
-    }
-
-    public function showEmbed(Request $request, $username, int $id)
-    {
-        if (! (bool) config_cache('instance.embed.post')) {
-            $res = view('status.embed-removed');
-
-            return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-        }
-
-        $status = StatusService::get($id);
-
-        if (
-            ! $status ||
-            ! isset($status['account'], $status['account']['id'], $status['local']) ||
-            ! $status['local'] ||
-            strtolower($status['account']['username']) !== strtolower($username)
-        ) {
-            $content = view('status.embed-removed');
-
-            return response($content, 404)->header('X-Frame-Options', 'ALLOWALL');
-        }
-
-        $profile = AccountService::get($status['account']['id'], true);
-
-        if (! $profile || $profile['locked'] || ! $profile['local']) {
-            $content = view('status.embed-removed');
-
-            return response($content)->header('X-Frame-Options', 'ALLOWALL');
-        }
-
-        $aiCheck = Cache::remember('profile:ai-check:spam-login:'.$profile['id'], 3600, function () use ($profile) {
-            $user = Profile::find($profile['id']);
-            if (! $user) {
-                return true;
-            }
-            $exists = AccountInterstitial::whereUserId($user->user_id)->where('is_spam', 1)->count();
-            if ($exists) {
-                return true;
-            }
-
-            return false;
-        });
-
-        if ($aiCheck) {
-            $res = view('status.embed-removed');
-
-            return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-        }
-
-        $status = StatusService::get($id);
-
-        if (
-            ! $status ||
-            ! isset($status['account'], $status['account']['id']) ||
-            intval($status['account']['id']) !== intval($profile['id']) ||
-            $status['sensitive'] ||
-            $status['visibility'] !== 'public' ||
-            $status['pf_type'] !== 'photo'
-        ) {
-            $content = view('status.embed-removed');
-
-            return response($content)->header('X-Frame-Options', 'ALLOWALL');
-        }
-
-        $showLikes = $request->filled('likes') && $request->likes == true;
-        $showCaption = $request->filled('caption') && $request->caption !== false;
-        $layout = $request->filled('layout') && $request->layout == 'compact' ? 'compact' : 'full';
-        $content = view('status.embed', compact('status', 'showLikes', 'showCaption', 'layout'));
-
-        return response($content)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-    }
-
-    public function showObject(Request $request, $username, int $id)
-    {
-        $user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
-
-        if ($user->status != null) {
-            return ProfileController::accountCheck($user);
-        }
-
-        $status = Status::whereProfileId($user->id)
-            ->whereNotIn('visibility', ['draft', 'direct'])
-            ->findOrFail($id);
-
-        abort_if($status->uri, 404);
-
-        if ($status->visibility == 'private' || $user->is_private) {
-            if (! Auth::check()) {
-                abort(403);
-            }
-            $pid = Auth::user()->profile;
-            if ($user->followedBy($pid) == false && $user->id !== $pid->id) {
-                abort(403);
-            }
-        }
-
-        return $this->showActivityPub($request, $status);
-    }
-
-    public function compose()
-    {
-        $this->authCheck();
-
-        return view('status.compose');
-    }
-
-    public function store(Request $request)
-    {
-
-    }
-
-    public function delete(Request $request)
-    {
-        $this->authCheck();
-
-        $this->validate($request, [
-            'item' => 'required|integer|min:1',
-        ]);
-
-        $status = Status::findOrFail($request->input('item'));
-
-        $user = Auth::user();
-
-        if ($status->profile_id != $user->profile->id &&
-            $user->is_admin == true &&
-            $status->uri == null
-        ) {
-            $media = $status->media;
-
-            $ai = new AccountInterstitial;
-            $ai->user_id = $status->profile->user_id;
-            $ai->type = 'post.removed';
-            $ai->view = 'account.moderation.post.removed';
-            $ai->item_type = 'App\Status';
-            $ai->item_id = $status->id;
-            $ai->has_media = (bool) $media->count();
-            $ai->blurhash = $media->count() ? $media->first()->blurhash : null;
-            $ai->meta = json_encode([
-                'caption' => $status->caption,
-                'created_at' => $status->created_at,
-                'type' => $status->type,
-                'url' => $status->url(),
-                'is_nsfw' => $status->is_nsfw,
-                'scope' => $status->scope,
-                'reblog' => $status->reblog_of_id,
-                'likes_count' => $status->likes_count,
-                'reblogs_count' => $status->reblogs_count,
-            ]);
-            $ai->save();
-
-            $u = $status->profile->user;
-            $u->has_interstitial = true;
-            $u->save();
-        }
-
-        if ($status->in_reply_to_id) {
-            $parent = Status::find($status->in_reply_to_id);
-            if ($parent && ($parent->profile_id == $user->profile_id) || ($status->profile_id == $user->profile_id) || $user->is_admin) {
-                Cache::forget('_api:statuses:recent_9:'.$status->profile_id);
-                Cache::forget('profile:status_count:'.$status->profile_id);
-                Cache::forget('profile:embed:'.$status->profile_id);
-                StatusService::del($status->id, true);
-                Cache::forget('profile:status_count:'.$status->profile_id);
-                $status->uri ? RemoteStatusDelete::dispatch($status) : StatusDelete::dispatch($status);
-            }
-        } elseif ($status->profile_id == $user->profile_id || $user->is_admin == true) {
-            Cache::forget('_api:statuses:recent_9:'.$status->profile_id);
-            Cache::forget('profile:status_count:'.$status->profile_id);
-            Cache::forget('profile:embed:'.$status->profile_id);
-            StatusService::del($status->id, true);
-            Cache::forget('profile:status_count:'.$status->profile_id);
-            $status->uri ? RemoteStatusDelete::dispatch($status) : StatusDelete::dispatch($status);
-        }
-
-        if ($request->wantsJson()) {
-            return response()->json(['Status successfully deleted.']);
-        } else {
-            return redirect($user->url());
-        }
-    }
-
-    public function storeShare(Request $request)
-    {
-        $this->authCheck();
-
-        $this->validate($request, [
-            'item' => 'required|integer|min:1',
-        ]);
-
-        $user = Auth::user();
-        $profile = $user->profile;
-        $status = Status::whereScope('public')
-            ->findOrFail($request->input('item'));
-
-        $count = $status->reblogs_count;
-
-        $exists = Status::whereProfileId(Auth::user()->profile->id)
-            ->whereReblogOfId($status->id)
-            ->exists();
-        if ($exists == true) {
-            $shares = Status::whereProfileId(Auth::user()->profile->id)
-                ->whereReblogOfId($status->id)
-                ->get();
-            foreach ($shares as $share) {
-                UndoSharePipeline::dispatch($share);
-                ReblogService::del($profile->id, $status->id);
-                $count--;
-            }
-        } else {
-            $share = new Status();
-            $share->profile_id = $profile->id;
-            $share->reblog_of_id = $status->id;
-            $share->in_reply_to_profile_id = $status->profile_id;
-            $share->type = 'share';
-            $share->save();
-            $count++;
-            SharePipeline::dispatch($share);
-            ReblogService::add($profile->id, $status->id);
-        }
-
-        Cache::forget('status:'.$status->id.':sharedby:userid:'.$user->id);
-        StatusService::del($status->id);
-
-        if ($request->ajax()) {
-            $response = ['code' => 200, 'msg' => 'Share saved', 'count' => $count];
-        } else {
-            $response = redirect($status->url());
-        }
-
-        return $response;
-    }
-
-    public function showActivityPub(Request $request, $status)
-    {
-        $object = $status->type == 'poll' ? new Question() : new Note();
-        $fractal = new Fractal\Manager();
-        $resource = new Fractal\Resource\Item($status, $object);
-        $res = $fractal->createData($resource)->toArray();
-
-        return response()->json($res['data'], 200, ['Content-Type' => 'application/activity+json'], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-    }
-
-    public function edit(Request $request, $username, $id)
-    {
-        $this->authCheck();
-        $user = Auth::user()->profile;
-        $status = Status::whereProfileId($user->id)
-            ->with(['media'])
-            ->findOrFail($id);
-        $licenses = License::get();
-
-        return view('status.edit', compact('user', 'status', 'licenses'));
-    }
-
-    public function editStore(Request $request, $username, $id)
-    {
-        $this->authCheck();
-        $user = Auth::user()->profile;
-        $status = Status::whereProfileId($user->id)
-            ->with(['media'])
-            ->findOrFail($id);
-
-        $this->validate($request, [
-            'license' => 'nullable|integer|min:1|max:16',
-        ]);
-
-        $licenseId = $request->input('license');
-
-        $status->media->each(function ($media) use ($licenseId) {
-            $media->license = $licenseId;
-            $media->save();
-            Cache::forget('status:transformer:media:attachments:'.$media->status_id);
-        });
-
-        return redirect($status->url());
-    }
-
-    protected function authCheck()
-    {
-        if (Auth::check() == false) {
-            abort(403);
-        }
-    }
-
-    protected function validateVisibility($visibility)
-    {
-        $allowed = ['public', 'unlisted', 'private'];
-
-        return in_array($visibility, $allowed) ? $visibility : 'public';
-    }
-
-    public static function mimeTypeCheck($mimes)
-    {
-        $allowed = explode(',', config_cache('pixelfed.media_types'));
-        $count = count($mimes);
-        $photos = 0;
-        $videos = 0;
-        foreach ($mimes as $mime) {
-            if (in_array($mime, $allowed) == false && $mime !== 'video/mp4') {
-                continue;
-            }
-            if (str_contains($mime, 'image/')) {
-                $photos++;
-            }
-            if (str_contains($mime, 'video/')) {
-                $videos++;
-            }
-        }
-        if ($photos == 1 && $videos == 0) {
-            return 'photo';
-        }
-        if ($videos == 1 && $photos == 0) {
-            return 'video';
-        }
-        if ($photos > 1 && $videos == 0) {
-            return 'photo:album';
-        }
-        if ($videos > 1 && $photos == 0) {
-            return 'video:album';
-        }
-        if ($photos >= 1 && $videos >= 1) {
-            return 'photo:video:album';
-        }
-
-        return 'text';
-    }
-
-    public function toggleVisibility(Request $request)
-    {
-        $this->authCheck();
-        $this->validate($request, [
-            'item' => 'required|string|min:1|max:20',
-            'disableComments' => 'required|boolean',
-        ]);
-
-        $user = Auth::user();
-        $id = $request->input('item');
-        $state = $request->input('disableComments');
-
-        $status = Status::findOrFail($id);
-
-        if ($status->profile_id != $user->profile->id && $user->is_admin == false) {
-            abort(403);
-        }
-
-        $status->comments_disabled = $status->comments_disabled == true ? false : true;
-        $status->save();
-
-        return response()->json([200]);
-    }
-
-    public function storeView(Request $request)
-    {
-        abort_if(! $request->user(), 403);
-
-        $views = $request->input('_v');
-        $uid = $request->user()->profile_id;
-
-        if (empty($views) || ! is_array($views)) {
-            return response()->json(0);
-        }
-
-        Cache::forget('profile:home-timeline-cursor:'.$request->user()->id);
-
-        foreach ($views as $view) {
-            if (! isset($view['sid']) || ! isset($view['pid'])) {
-                continue;
-            }
-            DB::transaction(function () use ($view, $uid) {
-                StatusView::firstOrCreate([
-                    'status_id' => $view['sid'],
-                    'status_profile_id' => $view['pid'],
-                    'profile_id' => $uid,
-                ]);
-            });
-        }
-
-        return response()->json(1);
-    }
+	public function show(Request $request, $username, $id)
+	{
+		// redirect authed users to Metro 2.0
+		if($request->user()) {
+			// unless they force static view
+			if(!$request->has('fs') || $request->input('fs') != '1') {
+				return redirect('/i/web/post/' . $id);
+			}
+		}
+
+		$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
+
+		if($user->status != null) {
+			return ProfileController::accountCheck($user);
+		}
+
+		$status = Status::whereProfileId($user->id)
+				->whereNull('reblog_of_id')
+				->whereIn('scope', ['public','unlisted', 'private'])
+				->findOrFail($id);
+
+		if($status->uri || $status->url) {
+			$url = $status->uri ?? $status->url;
+			if(ends_with($url, '/activity')) {
+				$url = str_replace('/activity', '', $url);
+			}
+			return redirect($url);
+		}
+
+		if($status->visibility == 'private' || $user->is_private) {
+			if(!Auth::check()) {
+				abort(404);
+			}
+			$pid = Auth::user()->profile;
+			if($user->followedBy($pid) == false && $user->id !== $pid->id && Auth::user()->is_admin == false) {
+				abort(404);
+			}
+		}
+
+		if($status->type == 'archived') {
+			if(Auth::user()->profile_id !== $status->profile_id) {
+				abort(404);
+			}
+		}
+
+		if($request->user() && $request->user()->profile_id != $status->profile_id) {
+			StatusView::firstOrCreate([
+				'status_id' => $status->id,
+				'status_profile_id' => $status->profile_id,
+				'profile_id' => $request->user()->profile_id
+			]);
+		}
+
+		if ($request->wantsJson() && config_cache('federation.activitypub.enabled')) {
+			return $this->showActivityPub($request, $status);
+		}
+
+		$template = $status->in_reply_to_id ? 'status.reply' : 'status.show';
+		return view($template, compact('user', 'status'));
+	}
+
+	public function shortcodeRedirect(Request $request, $id)
+	{
+		abort(404);
+	}
+
+	public function showId(int $id)
+	{
+		abort(404);
+		$status = Status::whereNull('reblog_of_id')
+				->whereIn('scope', ['public', 'unlisted'])
+				->findOrFail($id);
+		return redirect($status->url());
+	}
+
+	public function showEmbed(Request $request, $username, int $id)
+	{
+		if(!config('instance.embed.post')) {
+			$res = view('status.embed-removed');
+			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+		}
+
+		$profile = Profile::whereNull(['domain','status'])
+			->whereIsPrivate(false)
+			->whereUsername($username)
+			->first();
+
+		if(!$profile) {
+			$content = view('status.embed-removed');
+			return response($content)->header('X-Frame-Options', 'ALLOWALL');
+		}
+
+		$aiCheck = Cache::remember('profile:ai-check:spam-login:' . $profile->id, 86400, function() use($profile) {
+			$exists = AccountInterstitial::whereUserId($profile->user_id)->where('is_spam', 1)->count();
+			if($exists) {
+				return true;
+			}
+
+			return false;
+		});
+
+		if($aiCheck) {
+			$res = view('status.embed-removed');
+			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+		}
+		$status = Status::whereProfileId($profile->id)
+			->whereNull('uri')
+			->whereScope('public')
+			->whereIsNsfw(false)
+			->whereIn('type', ['photo', 'video','photo:album'])
+			->find($id);
+		if(!$status) {
+			$content = view('status.embed-removed');
+			return response($content)->header('X-Frame-Options', 'ALLOWALL');
+		}
+		$showLikes = $request->filled('likes') && $request->likes == true;
+		$showCaption = $request->filled('caption') && $request->caption !== false;
+		$layout = $request->filled('layout') && $request->layout == 'compact' ? 'compact' : 'full';
+		$content = view('status.embed', compact('status', 'showLikes', 'showCaption', 'layout'));
+		return response($content)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
+	}
+
+	public function showObject(Request $request, $username, int $id)
+	{
+		$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
+
+		if($user->status != null) {
+			return ProfileController::accountCheck($user);
+		}
+
+		$status = Status::whereProfileId($user->id)
+				->whereNotIn('visibility',['draft','direct'])
+				->findOrFail($id);
+
+		abort_if($status->uri, 404);
+
+		if($status->visibility == 'private' || $user->is_private) {
+			if(!Auth::check()) {
+				abort(403);
+			}
+			$pid = Auth::user()->profile;
+			if($user->followedBy($pid) == false && $user->id !== $pid->id) {
+				abort(403);
+			}
+		}
+
+		return $this->showActivityPub($request, $status);
+	}
+
+	public function compose()
+	{
+		$this->authCheck();
+
+		return view('status.compose');
+	}
+
+	public function store(Request $request)
+	{
+		return;
+	}
+
+	public function delete(Request $request)
+	{
+		$this->authCheck();
+
+		$this->validate($request, [
+		  'item'  => 'required|integer|min:1',
+		]);
+
+		$status = Status::findOrFail($request->input('item'));
+
+		$user = Auth::user();
+
+		if($status->profile_id != $user->profile->id &&
+			$user->is_admin == true &&
+			$status->uri == null
+		) {
+			$media = $status->media;
+
+			$ai = new AccountInterstitial;
+			$ai->user_id = $status->profile->user_id;
+			$ai->type = 'post.removed';
+			$ai->view = 'account.moderation.post.removed';
+			$ai->item_type = 'App\Status';
+			$ai->item_id = $status->id;
+			$ai->has_media = (bool) $media->count();
+			$ai->blurhash = $media->count() ? $media->first()->blurhash : null;
+			$ai->meta = json_encode([
+				'caption' => $status->caption,
+				'created_at' => $status->created_at,
+				'type' => $status->type,
+				'url' => $status->url(),
+				'is_nsfw' => $status->is_nsfw,
+				'scope' => $status->scope,
+				'reblog' => $status->reblog_of_id,
+				'likes_count' => $status->likes_count,
+				'reblogs_count' => $status->reblogs_count,
+			]);
+			$ai->save();
+
+			$u = $status->profile->user;
+			$u->has_interstitial = true;
+			$u->save();
+		}
+
+		if($status->in_reply_to_id) {
+			$parent = Status::find($status->in_reply_to_id);
+			if($parent && ($parent->profile_id == $user->profile_id) || ($status->profile_id == $user->profile_id) || $user->is_admin) {
+				Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
+				Cache::forget('profile:status_count:' . $status->profile_id);
+				Cache::forget('profile:embed:' . $status->profile_id);
+				StatusService::del($status->id, true);
+				Cache::forget('profile:status_count:'.$status->profile_id);
+				StatusDelete::dispatch($status);
+			}
+		} else if ($status->profile_id == $user->profile_id || $user->is_admin == true) {
+			Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
+			Cache::forget('profile:status_count:' . $status->profile_id);
+			Cache::forget('profile:embed:' . $status->profile_id);
+			StatusService::del($status->id, true);
+			Cache::forget('profile:status_count:'.$status->profile_id);
+			StatusDelete::dispatch($status);
+		}
+
+		if($request->wantsJson()) {
+			return response()->json(['Status successfully deleted.']);
+		} else {
+			return redirect($user->url());
+		}
+	}
+
+	public function storeShare(Request $request)
+	{
+		$this->authCheck();
+
+		$this->validate($request, [
+		  'item'    => 'required|integer|min:1',
+		]);
+
+		$user = Auth::user();
+		$profile = $user->profile;
+		$status = Status::whereScope('public')
+			->findOrFail($request->input('item'));
+
+		$count = $status->reblogs_count;
+
+		$exists = Status::whereProfileId(Auth::user()->profile->id)
+				  ->whereReblogOfId($status->id)
+				  ->exists();
+		if ($exists == true) {
+			$shares = Status::whereProfileId(Auth::user()->profile->id)
+				  ->whereReblogOfId($status->id)
+				  ->get();
+			foreach ($shares as $share) {
+				UndoSharePipeline::dispatch($share);
+				ReblogService::del($profile->id, $status->id);
+				$count--;
+			}
+		} else {
+			$share = new Status();
+			$share->profile_id = $profile->id;
+			$share->reblog_of_id = $status->id;
+			$share->in_reply_to_profile_id = $status->profile_id;
+			$share->type = 'share';
+			$share->save();
+			$count++;
+			SharePipeline::dispatch($share);
+			ReblogService::add($profile->id, $status->id);
+		}
+
+		Cache::forget('status:'.$status->id.':sharedby:userid:'.$user->id);
+		StatusService::del($status->id);
+
+		if ($request->ajax()) {
+			$response = ['code' => 200, 'msg' => 'Share saved', 'count' => $count];
+		} else {
+			$response = redirect($status->url());
+		}
+
+		return $response;
+	}
+
+	public function showActivityPub(Request $request, $status)
+	{
+		$object = $status->type == 'poll' ? new Question() : new Note();
+		$fractal = new Fractal\Manager();
+		$resource = new Fractal\Resource\Item($status, $object);
+		$res = $fractal->createData($resource)->toArray();
+
+		return response()->json($res['data'], 200, ['Content-Type' => 'application/activity+json'], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+	}
+
+	public function edit(Request $request, $username, $id)
+	{
+		$this->authCheck();
+		$user = Auth::user()->profile;
+		$status = Status::whereProfileId($user->id)
+				->with(['media'])
+				->findOrFail($id);
+		$licenses = License::get();
+		return view('status.edit', compact('user', 'status', 'licenses'));
+	}
+
+	public function editStore(Request $request, $username, $id)
+	{
+		$this->authCheck();
+		$user = Auth::user()->profile;
+		$status = Status::whereProfileId($user->id)
+				->with(['media'])
+				->findOrFail($id);
+
+		$this->validate($request, [
+		  'license'      => 'nullable|integer|min:1|max:16',
+		]);
+
+		$licenseId = $request->input('license');
+
+		$status->media->each(function($media) use($licenseId) {
+			$media->license = $licenseId;
+			$media->save();
+			Cache::forget('status:transformer:media:attachments:'.$media->status_id);
+		});
+
+		return redirect($status->url());
+	}
+
+	protected function authCheck()
+	{
+		if (Auth::check() == false) {
+			abort(403);
+		}
+	}
+
+	protected function validateVisibility($visibility)
+	{
+		$allowed = ['public', 'unlisted', 'private'];
+		return in_array($visibility, $allowed) ? $visibility : 'public';
+	}
+
+	public static function mimeTypeCheck($mimes)
+	{
+		$allowed = explode(',', config_cache('pixelfed.media_types'));
+		$count = count($mimes);
+		$photos = 0;
+		$videos = 0;
+		foreach($mimes as $mime) {
+			if(in_array($mime, $allowed) == false && $mime !== 'video/mp4') {
+				continue;
+			}
+			if(str_contains($mime, 'image/')) {
+				$photos++;
+			}
+			if(str_contains($mime, 'video/')) {
+				$videos++;
+			}
+		}
+		if($photos == 1 && $videos == 0) {
+			return 'photo';
+		}
+		if($videos == 1 && $photos == 0) {
+			return 'video';
+		}
+		if($photos > 1 && $videos == 0) {
+			return 'photo:album';
+		}
+		if($videos > 1 && $photos == 0) {
+			return 'video:album';
+		}
+		if($photos >= 1 && $videos >= 1) {
+			return 'photo:video:album';
+		}
+
+		return 'text';
+	}
+
+	public function toggleVisibility(Request $request) {
+		$this->authCheck();
+		$this->validate($request, [
+			'item' => 'required|string|min:1|max:20',
+			'disableComments' => 'required|boolean'
+		]);
+
+		$user = Auth::user();
+		$id = $request->input('item');
+		$state = $request->input('disableComments');
+
+		$status = Status::findOrFail($id);
+
+		if($status->profile_id != $user->profile->id && $user->is_admin == false) {
+			abort(403);
+		}
+
+		$status->comments_disabled = $status->comments_disabled == true ? false : true;
+		$status->save();
+
+		return response()->json([200]);
+	}
+
+	public function storeView(Request $request)
+	{
+		abort_if(!$request->user(), 403);
+
+		$views = $request->input('_v');
+		$uid = $request->user()->profile_id;
+
+		if(empty($views) || !is_array($views)) {
+			return response()->json(0);
+		}
+
+		Cache::forget('profile:home-timeline-cursor:' . $request->user()->id);
+
+		foreach($views as $view) {
+			if(!isset($view['sid']) || !isset($view['pid'])) {
+				continue;
+			}
+			DB::transaction(function () use($view, $uid) {
+				StatusView::firstOrCreate([
+						'status_id' => $view['sid'],
+						'status_profile_id' => $view['pid'],
+						'profile_id' => $uid
+				]);
+			});
+		}
+
+		return response()->json(1);
+	}
 }

app/Http/Controllers/Stories/StoryApiV1Controller.php

@@ -2,514 +2,357 @@
 
 namespace App\Http\Controllers\Stories;
 
-use App\DirectMessage;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\StoryView as StoryViewResource;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
+use App\Models\Conversation;
+use App\DirectMessage;
+use App\Notification;
+use App\Story;
+use App\Status;
+use App\StoryView;
 use App\Jobs\StoryPipeline\StoryDelete;
 use App\Jobs\StoryPipeline\StoryFanout;
 use App\Jobs\StoryPipeline\StoryReplyDeliver;
 use App\Jobs\StoryPipeline\StoryViewDeliver;
-use App\Models\Conversation;
-use App\Notification;
 use App\Services\AccountService;
 use App\Services\MediaPathService;
 use App\Services\StoryService;
-use App\Status;
-use App\Story;
-use App\StoryView;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 
 class StoryApiV1Controller extends Controller
 {
-    const RECENT_KEY = 'pf:stories:recent-by-id:';
-
-    const RECENT_TTL = 300;
-
-    public function carousel(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-        $pid = $request->user()->profile_id;
-
-        if (config('database.default') == 'pgsql') {
-            $s = Cache::remember(self::RECENT_KEY.$pid, self::RECENT_TTL, function () use ($pid) {
-                return Story::select('stories.*', 'followers.following_id')
-                    ->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
-                    ->where('followers.profile_id', $pid)
-                    ->where('stories.active', true)
-                    ->map(function ($s) {
-                        $r = new \StdClass;
-                        $r->id = $s->id;
-                        $r->profile_id = $s->profile_id;
-                        $r->type = $s->type;
-                        $r->path = $s->path;
-
-                        return $r;
-                    })
-                    ->unique('profile_id');
-            });
-        } else {
-            $s = Cache::remember(self::RECENT_KEY.$pid, self::RECENT_TTL, function () use ($pid) {
-                return Story::select('stories.*', 'followers.following_id')
-                    ->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
-                    ->where('followers.profile_id', $pid)
-                    ->where('stories.active', true)
-                    ->orderBy('id')
-                    ->get();
-            });
-        }
-
-        $nodes = $s->map(function ($s) use ($pid) {
-            $profile = AccountService::get($s->profile_id, true);
-            if (! $profile || ! isset($profile['id'])) {
-                return false;
-            }
-
-            return [
-                'id' => (string) $s->id,
-                'pid' => (string) $s->profile_id,
-                'type' => $s->type,
-                'src' => url(Storage::url($s->path)),
-                'duration' => $s->duration ?? 3,
-                'seen' => StoryService::hasSeen($pid, $s->id),
-                'created_at' => $s->created_at->format('c'),
-            ];
-        })
-            ->filter()
-            ->groupBy('pid')
-            ->map(function ($item) use ($pid) {
-                $profile = AccountService::get($item[0]['pid'], true);
-                $url = $profile['local'] ? url("/stories/{$profile['username']}") :
-                    url("/i/rs/{$profile['id']}");
-
-                return [
-                    'id' => 'pfs:'.$profile['id'],
-                    'user' => [
-                        'id' => (string) $profile['id'],
-                        'username' => $profile['username'],
-                        'username_acct' => $profile['acct'],
-                        'avatar' => $profile['avatar'],
-                        'local' => $profile['local'],
-                        'is_author' => $profile['id'] == $pid,
-                    ],
-                    'nodes' => $item,
-                    'url' => $url,
-                    'seen' => StoryService::hasSeen($pid, StoryService::latest($profile['id'])),
-                ];
-            })
-            ->sortBy('seen')
-            ->values();
-
-        $res = [
-            'self' => [],
-            'nodes' => $nodes,
-        ];
-
-        if (Story::whereProfileId($pid)->whereActive(true)->exists()) {
-            $selfStories = Story::whereProfileId($pid)
-                ->whereActive(true)
-                ->get()
-                ->map(function ($s) {
-                    return [
-                        'id' => (string) $s->id,
-                        'type' => $s->type,
-                        'src' => url(Storage::url($s->path)),
-                        'duration' => $s->duration,
-                        'seen' => true,
-                        'created_at' => $s->created_at->format('c'),
-                    ];
-                })
-                ->sortBy('id')
-                ->values();
-            $selfProfile = AccountService::get($pid, true);
-            $res['self'] = [
-                'user' => [
-                    'id' => (string) $selfProfile['id'],
-                    'username' => $selfProfile['acct'],
-                    'avatar' => $selfProfile['avatar'],
-                    'local' => $selfProfile['local'],
-                    'is_author' => true,
-                ],
-
-                'nodes' => $selfStories,
-            ];
-        }
-
-        return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-    }
-
-    public function selfCarousel(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-        $pid = $request->user()->profile_id;
-
-        if (config('database.default') == 'pgsql') {
-            $s = Cache::remember(self::RECENT_KEY.$pid, self::RECENT_TTL, function () use ($pid) {
-                return Story::select('stories.*', 'followers.following_id')
-                    ->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
-                    ->where('followers.profile_id', $pid)
-                    ->where('stories.active', true)
-                    ->map(function ($s) {
-                        $r = new \StdClass;
-                        $r->id = $s->id;
-                        $r->profile_id = $s->profile_id;
-                        $r->type = $s->type;
-                        $r->path = $s->path;
-
-                        return $r;
-                    })
-                    ->unique('profile_id');
-            });
-        } else {
-            $s = Cache::remember(self::RECENT_KEY.$pid, self::RECENT_TTL, function () use ($pid) {
-                return Story::select('stories.*', 'followers.following_id')
-                    ->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
-                    ->where('followers.profile_id', $pid)
-                    ->where('stories.active', true)
-                    ->orderBy('id')
-                    ->get();
-            });
-        }
-
-        $nodes = $s->map(function ($s) use ($pid) {
-            $profile = AccountService::get($s->profile_id, true);
-            if (! $profile || ! isset($profile['id'])) {
-                return false;
-            }
-
-            return [
-                'id' => (string) $s->id,
-                'pid' => (string) $s->profile_id,
-                'type' => $s->type,
-                'src' => url(Storage::url($s->path)),
-                'duration' => $s->duration ?? 3,
-                'seen' => StoryService::hasSeen($pid, $s->id),
-                'created_at' => $s->created_at->format('c'),
-            ];
-        })
-            ->filter()
-            ->groupBy('pid')
-            ->map(function ($item) use ($pid) {
-                $profile = AccountService::get($item[0]['pid'], true);
-                $url = $profile['local'] ? url("/stories/{$profile['username']}") :
-                    url("/i/rs/{$profile['id']}");
-
-                return [
-                    'id' => 'pfs:'.$profile['id'],
-                    'user' => [
-                        'id' => (string) $profile['id'],
-                        'username' => $profile['username'],
-                        'username_acct' => $profile['acct'],
-                        'avatar' => $profile['avatar'],
-                        'local' => $profile['local'],
-                        'is_author' => $profile['id'] == $pid,
-                    ],
-                    'nodes' => $item,
-                    'url' => $url,
-                    'seen' => StoryService::hasSeen($pid, StoryService::latest($profile['id'])),
-                ];
-            })
-            ->sortBy('seen')
-            ->values();
-
-        $selfProfile = AccountService::get($pid, true);
-        $res = [
-            'self' => [
-                'user' => [
-                    'id' => (string) $selfProfile['id'],
-                    'username' => $selfProfile['acct'],
-                    'avatar' => $selfProfile['avatar'],
-                    'local' => $selfProfile['local'],
-                    'is_author' => true,
-                ],
-
-                'nodes' => [],
-            ],
-            'nodes' => $nodes,
-        ];
-
-        if (Story::whereProfileId($pid)->whereActive(true)->exists()) {
-            $selfStories = Story::whereProfileId($pid)
-                ->whereActive(true)
-                ->get()
-                ->map(function ($s) {
-                    return [
-                        'id' => (string) $s->id,
-                        'type' => $s->type,
-                        'src' => url(Storage::url($s->path)),
-                        'duration' => $s->duration,
-                        'seen' => true,
-                        'created_at' => $s->created_at->format('c'),
-                    ];
-                })
-                ->sortBy('id')
-                ->values();
-            $res['self']['nodes'] = $selfStories;
-        }
-
-        return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-    }
-
-    public function add(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'file' => function () {
-                return [
-                    'required',
-                    'mimetypes:image/jpeg,image/png,video/mp4',
-                    'max:'.config_cache('pixelfed.max_photo_size'),
-                ];
-            },
-            'duration' => 'sometimes|integer|min:0|max:30',
-        ]);
-
-        $user = $request->user();
-
-        $count = Story::whereProfileId($user->profile_id)
-            ->whereActive(true)
-            ->where('expires_at', '>', now())
-            ->count();
-
-        if ($count >= Story::MAX_PER_DAY) {
-            abort(418, 'You have reached your limit for new Stories today.');
-        }
-
-        $photo = $request->file('file');
-        $path = $this->storeMedia($photo, $user);
-
-        $story = new Story();
-        $story->duration = $request->input('duration', 3);
-        $story->profile_id = $user->profile_id;
-        $story->type = Str::endsWith($photo->getMimeType(), 'mp4') ? 'video' : 'photo';
-        $story->mime = $photo->getMimeType();
-        $story->path = $path;
-        $story->local = true;
-        $story->size = $photo->getSize();
-        $story->bearcap_token = str_random(64);
-        $story->expires_at = now()->addMinutes(1440);
-        $story->save();
-
-        $url = $story->path;
-
-        $res = [
-            'code' => 200,
-            'msg' => 'Successfully added',
-            'media_id' => (string) $story->id,
-            'media_url' => url(Storage::url($url)).'?v='.time(),
-            'media_type' => $story->type,
-        ];
-
-        return $res;
-    }
-
-    public function publish(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'media_id' => 'required',
-            'duration' => 'required|integer|min:0|max:30',
-            'can_reply' => 'required|boolean',
-            'can_react' => 'required|boolean',
-        ]);
-
-        $id = $request->input('media_id');
-        $user = $request->user();
-        $story = Story::whereProfileId($user->profile_id)
-            ->findOrFail($id);
-
-        $story->active = true;
-        $story->duration = $request->input('duration', 10);
-        $story->can_reply = $request->input('can_reply');
-        $story->can_react = $request->input('can_react');
-        $story->save();
-
-        StoryService::delLatest($story->profile_id);
-        StoryFanout::dispatch($story)->onQueue('story');
-        StoryService::addRotateQueue($story->id);
-
-        return [
-            'code' => 200,
-            'msg' => 'Successfully published',
-        ];
-    }
-
-    public function delete(Request $request, $id)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $user = $request->user();
-
-        $story = Story::whereProfileId($user->profile_id)
-            ->findOrFail($id);
-        $story->active = false;
-        $story->save();
-
-        StoryDelete::dispatch($story)->onQueue('story');
-
-        return [
-            'code' => 200,
-            'msg' => 'Successfully deleted',
-        ];
-    }
-
-    public function viewed(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'id' => 'required|min:1',
-        ]);
-        $id = $request->input('id');
-
-        $authed = $request->user()->profile;
-
-        $story = Story::with('profile')
-            ->findOrFail($id);
-        $exp = $story->expires_at;
-
-        $profile = $story->profile;
-
-        if ($story->profile_id == $authed->id) {
-            return [];
-        }
-
-        $publicOnly = (bool) $profile->followedBy($authed);
-        abort_if(! $publicOnly, 403);
-
-        $v = StoryView::firstOrCreate([
-            'story_id' => $id,
-            'profile_id' => $authed->id,
-        ]);
-
-        if ($v->wasRecentlyCreated) {
-            Story::findOrFail($story->id)->increment('view_count');
-
-            if ($story->local == false) {
-                StoryViewDeliver::dispatch($story, $authed)->onQueue('story');
-            }
-        }
-
-        Cache::forget('stories:recent:by_id:'.$authed->id);
-        StoryService::addSeen($authed->id, $story->id);
-
-        return ['code' => 200];
-    }
-
-    public function comment(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-        $this->validate($request, [
-            'sid' => 'required',
-            'caption' => 'required|string',
-        ]);
-        $pid = $request->user()->profile_id;
-        $text = $request->input('caption');
-
-        $story = Story::findOrFail($request->input('sid'));
-
-        abort_if(! $story->can_reply, 422);
-
-        $status = new Status;
-        $status->type = 'story:reply';
-        $status->profile_id = $pid;
-        $status->caption = $text;
-        $status->rendered = $text;
-        $status->scope = 'direct';
-        $status->visibility = 'direct';
-        $status->in_reply_to_profile_id = $story->profile_id;
-        $status->entities = json_encode([
-            'story_id' => $story->id,
-        ]);
-        $status->save();
-
-        $dm = new DirectMessage;
-        $dm->to_id = $story->profile_id;
-        $dm->from_id = $pid;
-        $dm->type = 'story:comment';
-        $dm->status_id = $status->id;
-        $dm->meta = json_encode([
-            'story_username' => $story->profile->username,
-            'story_actor_username' => $request->user()->username,
-            'story_id' => $story->id,
-            'story_media_url' => url(Storage::url($story->path)),
-            'caption' => $text,
-        ]);
-        $dm->save();
-
-        Conversation::updateOrInsert(
-            [
-                'to_id' => $story->profile_id,
-                'from_id' => $pid,
-            ],
-            [
-                'type' => 'story:comment',
-                'status_id' => $status->id,
-                'dm_id' => $dm->id,
-                'is_hidden' => false,
-            ]
-        );
-
-        if ($story->local) {
-            $n = new Notification;
-            $n->profile_id = $dm->to_id;
-            $n->actor_id = $dm->from_id;
-            $n->item_id = $dm->id;
-            $n->item_type = 'App\DirectMessage';
-            $n->action = 'story:comment';
-            $n->save();
-        } else {
-            StoryReplyDeliver::dispatch($story, $status)->onQueue('story');
-        }
-
-        return [
-            'code' => 200,
-            'msg' => 'Sent!',
-        ];
-    }
-
-    protected function storeMedia($photo, $user)
-    {
-        $mimes = explode(',', config_cache('pixelfed.media_types'));
-        if (in_array($photo->getMimeType(), [
-            'image/jpeg',
-            'image/png',
-            'video/mp4',
-        ]) == false) {
-            abort(400, 'Invalid media type');
-
-            return;
-        }
-
-        $storagePath = MediaPathService::story($user->profile);
-        $path = $photo->storePubliclyAs($storagePath, Str::random(random_int(2, 12)).'_'.Str::random(random_int(32, 35)).'_'.Str::random(random_int(1, 14)).'.'.$photo->extension());
-
-        return $path;
-    }
-
-    public function viewers(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'sid' => 'required|string|min:1|max:50',
-        ]);
-
-        $pid = $request->user()->profile_id;
-        $sid = $request->input('sid');
-
-        $story = Story::whereProfileId($pid)
-            ->whereActive(true)
-            ->findOrFail($sid);
-
-        $viewers = StoryView::whereStoryId($story->id)
-            ->orderByDesc('id')
-            ->cursorPaginate(10);
-
-        return StoryViewResource::collection($viewers);
-    }
+	public function carousel(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+		$pid = $request->user()->profile_id;
+
+		if(config('database.default') == 'pgsql') {
+			$s = Story::select('stories.*', 'followers.following_id')
+				->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
+				->where('followers.profile_id', $pid)
+				->where('stories.active', true)
+				->get();
+		} else {
+			$s = Story::select('stories.*', 'followers.following_id')
+				->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
+				->where('followers.profile_id', $pid)
+				->where('stories.active', true)
+				->orderBy('id')
+				->get();
+		}
+
+		$nodes = $s->map(function($s) use($pid) {
+			$profile = AccountService::get($s->profile_id, true);
+			if(!$profile || !isset($profile['id'])) {
+				return false;
+			}
+
+			return [
+				'id' => (string) $s->id,
+				'pid' => (string) $s->profile_id,
+				'type' => $s->type,
+				'src' => url(Storage::url($s->path)),
+				'duration' => $s->duration ?? 3,
+				'seen' => StoryService::hasSeen($pid, $s->id),
+				'created_at' => $s->created_at->format('c')
+			];
+		})
+		->filter()
+		->groupBy('pid')
+		->map(function($item) use($pid) {
+			$profile = AccountService::get($item[0]['pid'], true);
+			$url = $profile['local'] ? url("/stories/{$profile['username']}") :
+				url("/i/rs/{$profile['id']}");
+			return [
+				'id' => 'pfs:' . $profile['id'],
+				'user' => [
+					'id' => (string) $profile['id'],
+					'username' => $profile['username'],
+					'username_acct' => $profile['acct'],
+					'avatar' => $profile['avatar'],
+					'local' => $profile['local'],
+					'is_author' => $profile['id'] == $pid
+				],
+				'nodes' => $item,
+				'url' => $url,
+				'seen' => StoryService::hasSeen($pid, StoryService::latest($profile['id'])),
+			];
+		})
+		->sortBy('seen')
+		->values();
+
+		$res = [
+			'self' => [],
+			'nodes' => $nodes,
+		];
+
+		if(Story::whereProfileId($pid)->whereActive(true)->exists()) {
+			$selfStories = Story::whereProfileId($pid)
+				->whereActive(true)
+				->get()
+				->map(function($s) use($pid) {
+					return [
+						'id' => (string) $s->id,
+						'type' => $s->type,
+						'src' => url(Storage::url($s->path)),
+						'duration' => $s->duration,
+						'seen' => true,
+						'created_at' => $s->created_at->format('c')
+					];
+				})
+				->sortBy('id')
+				->values();
+			$selfProfile = AccountService::get($pid, true);
+			$res['self'] = [
+				'user' => [
+					'id' => (string) $selfProfile['id'],
+					'username' => $selfProfile['acct'],
+					'avatar' => $selfProfile['avatar'],
+					'local' => $selfProfile['local'],
+					'is_author' => true
+				],
+
+				'nodes' => $selfStories,
+			];
+		}
+		return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+	}
+
+	public function add(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$this->validate($request, [
+			'file' => function() {
+				return [
+					'required',
+					'mimetypes:image/jpeg,image/png,video/mp4',
+					'max:' . config_cache('pixelfed.max_photo_size'),
+				];
+			},
+			'duration' => 'sometimes|integer|min:0|max:30'
+		]);
+
+		$user = $request->user();
+
+		$count = Story::whereProfileId($user->profile_id)
+			->whereActive(true)
+			->where('expires_at', '>', now())
+			->count();
+
+		if($count >= Story::MAX_PER_DAY) {
+			abort(418, 'You have reached your limit for new Stories today.');
+		}
+
+		$photo = $request->file('file');
+		$path = $this->storeMedia($photo, $user);
+
+		$story = new Story();
+		$story->duration = $request->input('duration', 3);
+		$story->profile_id = $user->profile_id;
+		$story->type = Str::endsWith($photo->getMimeType(), 'mp4') ? 'video' :'photo';
+		$story->mime = $photo->getMimeType();
+		$story->path = $path;
+		$story->local = true;
+		$story->size = $photo->getSize();
+		$story->bearcap_token = str_random(64);
+		$story->expires_at = now()->addMinutes(1440);
+		$story->save();
+
+		$url = $story->path;
+
+		$res = [
+			'code' => 200,
+			'msg'  => 'Successfully added',
+			'media_id' => (string) $story->id,
+			'media_url' => url(Storage::url($url)) . '?v=' . time(),
+			'media_type' => $story->type
+		];
+
+		return $res;
+	}
+
+	public function publish(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$this->validate($request, [
+			'media_id' => 'required',
+			'duration' => 'required|integer|min:0|max:30',
+			'can_reply' => 'required|boolean',
+			'can_react' => 'required|boolean'
+		]);
+
+		$id = $request->input('media_id');
+		$user = $request->user();
+		$story = Story::whereProfileId($user->profile_id)
+			->findOrFail($id);
+
+		$story->active = true;
+		$story->duration = $request->input('duration', 10);
+		$story->can_reply = $request->input('can_reply');
+		$story->can_react = $request->input('can_react');
+		$story->save();
+
+		StoryService::delLatest($story->profile_id);
+		StoryFanout::dispatch($story)->onQueue('story');
+		StoryService::addRotateQueue($story->id);
+
+		return [
+			'code' => 200,
+			'msg'  => 'Successfully published',
+		];
+	}
+
+	public function delete(Request $request, $id)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$user = $request->user();
+
+		$story = Story::whereProfileId($user->profile_id)
+			->findOrFail($id);
+		$story->active = false;
+		$story->save();
+
+		StoryDelete::dispatch($story)->onQueue('story');
+
+		return [
+			'code' => 200,
+			'msg'  => 'Successfully deleted'
+		];
+	}
+
+	public function viewed(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$this->validate($request, [
+			'id'	=> 'required|min:1',
+		]);
+		$id = $request->input('id');
+
+		$authed = $request->user()->profile;
+
+		$story = Story::with('profile')
+			->findOrFail($id);
+		$exp = $story->expires_at;
+
+		$profile = $story->profile;
+
+		if($story->profile_id == $authed->id) {
+			return [];
+		}
+
+		$publicOnly = (bool) $profile->followedBy($authed);
+		abort_if(!$publicOnly, 403);
+
+		$v = StoryView::firstOrCreate([
+			'story_id' => $id,
+			'profile_id' => $authed->id
+		]);
+
+		if($v->wasRecentlyCreated) {
+			Story::findOrFail($story->id)->increment('view_count');
+
+			if($story->local == false) {
+				StoryViewDeliver::dispatch($story, $authed)->onQueue('story');
+			}
+		}
+
+		Cache::forget('stories:recent:by_id:' . $authed->id);
+		StoryService::addSeen($authed->id, $story->id);
+		return ['code' => 200];
+	}
+
+	public function comment(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+		$this->validate($request, [
+			'sid' => 'required',
+			'caption' => 'required|string'
+		]);
+		$pid = $request->user()->profile_id;
+		$text = $request->input('caption');
+
+		$story = Story::findOrFail($request->input('sid'));
+
+		abort_if(!$story->can_reply, 422);
+
+		$status = new Status;
+		$status->type = 'story:reply';
+		$status->profile_id = $pid;
+		$status->caption = $text;
+		$status->rendered = $text;
+		$status->scope = 'direct';
+		$status->visibility = 'direct';
+		$status->in_reply_to_profile_id = $story->profile_id;
+		$status->entities = json_encode([
+			'story_id' => $story->id
+		]);
+		$status->save();
+
+		$dm = new DirectMessage;
+		$dm->to_id = $story->profile_id;
+		$dm->from_id = $pid;
+		$dm->type = 'story:comment';
+		$dm->status_id = $status->id;
+		$dm->meta = json_encode([
+			'story_username' => $story->profile->username,
+			'story_actor_username' => $request->user()->username,
+			'story_id' => $story->id,
+			'story_media_url' => url(Storage::url($story->path)),
+			'caption' => $text
+		]);
+		$dm->save();
+
+		Conversation::updateOrInsert(
+			[
+				'to_id' => $story->profile_id,
+				'from_id' => $pid
+			],
+			[
+				'type' => 'story:comment',
+				'status_id' => $status->id,
+				'dm_id' => $dm->id,
+				'is_hidden' => false
+			]
+		);
+
+		if($story->local) {
+			$n = new Notification;
+			$n->profile_id = $dm->to_id;
+			$n->actor_id = $dm->from_id;
+			$n->item_id = $dm->id;
+			$n->item_type = 'App\DirectMessage';
+			$n->action = 'story:comment';
+			$n->save();
+		} else {
+			StoryReplyDeliver::dispatch($story, $status)->onQueue('story');
+		}
+
+		return [
+			'code' => 200,
+			'msg'  => 'Sent!'
+		];
+	}
+
+	protected function storeMedia($photo, $user)
+	{
+		$mimes = explode(',', config_cache('pixelfed.media_types'));
+		if(in_array($photo->getMimeType(), [
+			'image/jpeg',
+			'image/png',
+			'video/mp4'
+		]) == false) {
+			abort(400, 'Invalid media type');
+			return;
+		}
+
+		$storagePath = MediaPathService::story($user->profile);
+		$path = $photo->storePubliclyAs($storagePath, Str::random(random_int(2, 12)) . '_' . Str::random(random_int(32, 35)) . '_' . Str::random(random_int(1, 14)) . '.' . $photo->extension());
+		return $path;
+	}
 }

app/Http/Controllers/StoryComposeController.php

@@ -2,338 +2,333 @@
 
 namespace App\Http\Controllers;
 
-use App\DirectMessage;
-use App\Jobs\StoryPipeline\StoryDelete;
-use App\Jobs\StoryPipeline\StoryFanout;
-use App\Jobs\StoryPipeline\StoryReactionDeliver;
-use App\Jobs\StoryPipeline\StoryReplyDeliver;
-use App\Models\Conversation;
-use App\Models\Poll;
-use App\Models\PollVote;
-use App\Notification;
-use App\Report;
-use App\Services\FollowerService;
-use App\Services\MediaPathService;
-use App\Services\StoryService;
-use App\Services\UserRoleService;
-use App\Status;
-use App\Story;
-use FFMpeg;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
+use App\Media;
+use App\Profile;
+use App\Report;
+use App\DirectMessage;
+use App\Notification;
+use App\Status;
+use App\Story;
+use App\StoryView;
+use App\Models\Poll;
+use App\Models\PollVote;
+use App\Services\ProfileService;
+use App\Services\StoryService;
+use Cache, Storage;
 use Image as Intervention;
-use Storage;
+use App\Services\FollowerService;
+use App\Services\MediaPathService;
+use FFMpeg;
+use FFMpeg\Coordinate\Dimension;
+use FFMpeg\Format\Video\X264;
+use App\Jobs\StoryPipeline\StoryReactionDeliver;
+use App\Jobs\StoryPipeline\StoryReplyDeliver;
+use App\Jobs\StoryPipeline\StoryFanout;
+use App\Jobs\StoryPipeline\StoryDelete;
+use ImageOptimizer;
+use App\Models\Conversation;
 
 class StoryComposeController extends Controller
 {
     public function apiV1Add(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-        $this->validate($request, [
-            'file' => function () {
-                return [
-                    'required',
-                    'mimetypes:image/jpeg,image/png,video/mp4',
-                    'max:'.config_cache('pixelfed.max_photo_size'),
-                ];
-            },
+		$this->validate($request, [
+			'file' => function() {
+				return [
+					'required',
+					'mimetypes:image/jpeg,image/png,video/mp4',
+					'max:' . config_cache('pixelfed.max_photo_size'),
+				];
+			},
+		]);
+
+		$user = $request->user();
+
+		$count = Story::whereProfileId($user->profile_id)
+			->whereActive(true)
+			->where('expires_at', '>', now())
+			->count();
+
+		if($count >= Story::MAX_PER_DAY) {
+			abort(418, 'You have reached your limit for new Stories today.');
+		}
+
+		$photo = $request->file('file');
+		$path = $this->storePhoto($photo, $user);
+
+		$story = new Story();
+		$story->duration = 3;
+		$story->profile_id = $user->profile_id;
+		$story->type = Str::endsWith($photo->getMimeType(), 'mp4') ? 'video' :'photo';
+		$story->mime = $photo->getMimeType();
+		$story->path = $path;
+		$story->local = true;
+		$story->size = $photo->getSize();
+		$story->bearcap_token = str_random(64);
+		$story->expires_at = now()->addMinutes(1440);
+		$story->save();
+
+		$url = $story->path;
+
+		$res = [
+			'code' => 200,
+			'msg'  => 'Successfully added',
+			'media_id' => (string) $story->id,
+			'media_url' => url(Storage::url($url)) . '?v=' . time(),
+			'media_type' => $story->type
+		];
+
+		if($story->type === 'video') {
+			$video = FFMpeg::open($path);
+			$duration = $video->getDurationInSeconds();
+			$res['media_duration'] = $duration;
+			if($duration > 500) {
+				Storage::delete($story->path);
+				$story->delete();
+				return response()->json([
+					'message' => 'Video duration cannot exceed 60 seconds'
+				], 422);
+			}
+		}
+
+		return $res;
+	}
+
+	protected function storePhoto($photo, $user)
+	{
+		$mimes = explode(',', config_cache('pixelfed.media_types'));
+		if(in_array($photo->getMimeType(), [
+			'image/jpeg',
+			'image/png',
+			'video/mp4'
+		]) == false) {
+			abort(400, 'Invalid media type');
+			return;
+		}
+
+		$storagePath = MediaPathService::story($user->profile);
+		$path = $photo->storePubliclyAs($storagePath, Str::random(random_int(2, 12)) . '_' . Str::random(random_int(32, 35)) . '_' . Str::random(random_int(1, 14)) . '.' . $photo->extension());
+		if(in_array($photo->getMimeType(), ['image/jpeg','image/png'])) {
+			$fpath = storage_path('app/' . $path);
+			$img = Intervention::make($fpath);
+			$img->orientate();
+			$img->save($fpath, config_cache('pixelfed.image_quality'));
+			$img->destroy();
+		}
+		return $path;
+	}
+
+	public function cropPhoto(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$this->validate($request, [
+			'media_id' => 'required|integer|min:1',
+			'width' => 'required',
+			'height' => 'required',
+			'x' => 'required',
+			'y' => 'required'
+		]);
+
+		$user = $request->user();
+		$id = $request->input('media_id');
+		$width = round($request->input('width'));
+		$height = round($request->input('height'));
+		$x = round($request->input('x'));
+		$y = round($request->input('y'));
+
+		$story = Story::whereProfileId($user->profile_id)->findOrFail($id);
+
+		$path = storage_path('app/' . $story->path);
+
+		if(!is_file($path)) {
+			abort(400, 'Invalid or missing media.');
+		}
+
+		if($story->type === 'photo') {
+			$img = Intervention::make($path);
+			$img->crop($width, $height, $x, $y);
+			$img->resize(1080, 1920, function ($constraint) {
+				$constraint->aspectRatio();
+			});
+			$img->save($path, config_cache('pixelfed.image_quality'));
+		}
+
+		return [
+			'code' => 200,
+			'msg'  => 'Successfully cropped',
+		];
+	}
+
+	public function publishStory(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$this->validate($request, [
+			'media_id' => 'required',
+			'duration' => 'required|integer|min:3|max:120',
+			'can_reply' => 'required|boolean',
+			'can_react' => 'required|boolean'
+		]);
+
+		$id = $request->input('media_id');
+		$user = $request->user();
+		$story = Story::whereProfileId($user->profile_id)
+			->findOrFail($id);
+
+		$story->active = true;
+		$story->duration = $request->input('duration', 10);
+		$story->can_reply = $request->input('can_reply');
+		$story->can_react = $request->input('can_react');
+		$story->save();
+
+		StoryService::delLatest($story->profile_id);
+		StoryFanout::dispatch($story)->onQueue('story');
+		StoryService::addRotateQueue($story->id);
+
+		return [
+			'code' => 200,
+			'msg'  => 'Successfully published',
+		];
+	}
+
+	public function apiV1Delete(Request $request, $id)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$user = $request->user();
+
+		$story = Story::whereProfileId($user->profile_id)
+			->findOrFail($id);
+		$story->active = false;
+		$story->save();
+
+		StoryDelete::dispatch($story)->onQueue('story');
+
+		return [
+			'code' => 200,
+			'msg'  => 'Successfully deleted'
+		];
+	}
+
+	public function compose(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		return view('stories.compose');
+	}
+
+	public function createPoll(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+		abort_if(!config_cache('instance.polls.enabled'), 404);
+
+		return $request->all();
+	}
+
+	public function publishStoryPoll(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$this->validate($request, [
+			'question' => 'required|string|min:6|max:140',
+			'options' => 'required|array|min:2|max:4',
+			'can_reply' => 'required|boolean',
+			'can_react' => 'required|boolean'
+		]);
+
+		$pid = $request->user()->profile_id;
+
+		$count = Story::whereProfileId($pid)
+			->whereActive(true)
+			->where('expires_at', '>', now())
+			->count();
+
+		if($count >= Story::MAX_PER_DAY) {
+			abort(418, 'You have reached your limit for new Stories today.');
+		}
+
+		$story = new Story;
+		$story->type = 'poll';
+		$story->story = json_encode([
+			'question' => $request->input('question'),
+			'options' => $request->input('options')
+		]);
+		$story->public = false;
+		$story->local = true;
+		$story->profile_id = $pid;
+		$story->expires_at = now()->addMinutes(1440);
+		$story->duration = 30;
+		$story->can_reply = false;
+		$story->can_react = false;
+		$story->save();
+
+		$poll = new Poll;
+		$poll->story_id = $story->id;
+		$poll->profile_id = $pid;
+		$poll->poll_options = $request->input('options');
+		$poll->expires_at = $story->expires_at;
+		$poll->cached_tallies = collect($poll->poll_options)->map(function($o) {
+			return 0;
+		})->toArray();
+		$poll->save();
+
+		$story->active = true;
+		$story->save();
+
+		StoryService::delLatest($story->profile_id);
+
+		return [
+			'code' => 200,
+			'msg'  => 'Successfully published',
+		];
+	}
+
+	public function storyPollVote(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$this->validate($request, [
+			'sid' => 'required',
+			'ci' => 'required|integer|min:0|max:3'
+		]);
+
+		$pid = $request->user()->profile_id;
+		$ci = $request->input('ci');
+		$story = Story::findOrFail($request->input('sid'));
+		abort_if(!FollowerService::follows($pid, $story->profile_id), 403);
+		$poll = Poll::whereStoryId($story->id)->firstOrFail();
+
+		$vote = new PollVote;
+		$vote->profile_id = $pid;
+		$vote->poll_id = $poll->id;
+		$vote->story_id = $story->id;
+		$vote->status_id = null;
+		$vote->choice = $ci;
+		$vote->save();
+
+		$poll->votes_count = $poll->votes_count + 1;
+    	$poll->cached_tallies = collect($poll->getTallies())->map(function($tally, $key) use($ci) {
+    		return $ci == $key ? $tally + 1 : $tally;
+    	})->toArray();
+    	$poll->save();
+
+		return 200;
+	}
+
+	public function storeReport(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+
+		$this->validate($request, [
+            'type'  => 'required|alpha_dash',
+            'id'    => 'required|integer|min:1',
         ]);
 
-        $user = $request->user();
-        abort_if($user->has_roles && ! UserRoleService::can('can-use-stories', $user->id), 403, 'Invalid permissions for this action');
-        $count = Story::whereProfileId($user->profile_id)
-            ->whereActive(true)
-            ->where('expires_at', '>', now())
-            ->count();
-
-        if ($count >= Story::MAX_PER_DAY) {
-            abort(418, 'You have reached your limit for new Stories today.');
-        }
-
-        $photo = $request->file('file');
-        $path = $this->storePhoto($photo, $user);
-
-        $story = new Story();
-        $story->duration = 3;
-        $story->profile_id = $user->profile_id;
-        $story->type = Str::endsWith($photo->getMimeType(), 'mp4') ? 'video' : 'photo';
-        $story->mime = $photo->getMimeType();
-        $story->path = $path;
-        $story->local = true;
-        $story->size = $photo->getSize();
-        $story->bearcap_token = str_random(64);
-        $story->expires_at = now()->addMinutes(1440);
-        $story->save();
-
-        $url = $story->path;
-
-        $res = [
-            'code' => 200,
-            'msg' => 'Successfully added',
-            'media_id' => (string) $story->id,
-            'media_url' => url(Storage::url($url)).'?v='.time(),
-            'media_type' => $story->type,
-        ];
-
-        if ($story->type === 'video') {
-            $video = FFMpeg::open($path);
-            $duration = $video->getDurationInSeconds();
-            $res['media_duration'] = $duration;
-            if ($duration > 500) {
-                Storage::delete($story->path);
-                $story->delete();
-
-                return response()->json([
-                    'message' => 'Video duration cannot exceed 60 seconds',
-                ], 422);
-            }
-        }
-
-        return $res;
-    }
-
-    protected function storePhoto($photo, $user)
-    {
-        $mimes = explode(',', config_cache('pixelfed.media_types'));
-        if (in_array($photo->getMimeType(), [
-            'image/jpeg',
-            'image/png',
-            'video/mp4',
-        ]) == false) {
-            abort(400, 'Invalid media type');
-
-            return;
-        }
-
-        $storagePath = MediaPathService::story($user->profile);
-        $path = $photo->storePubliclyAs($storagePath, Str::random(random_int(2, 12)).'_'.Str::random(random_int(32, 35)).'_'.Str::random(random_int(1, 14)).'.'.$photo->extension());
-        if (in_array($photo->getMimeType(), ['image/jpeg', 'image/png'])) {
-            $fpath = storage_path('app/'.$path);
-            $img = Intervention::make($fpath);
-            $img->orientate();
-            $img->save($fpath, config_cache('pixelfed.image_quality'));
-            $img->destroy();
-        }
-
-        return $path;
-    }
-
-    public function cropPhoto(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'media_id' => 'required|integer|min:1',
-            'width' => 'required',
-            'height' => 'required',
-            'x' => 'required',
-            'y' => 'required',
-        ]);
-
-        $user = $request->user();
-        $id = $request->input('media_id');
-        $width = round($request->input('width'));
-        $height = round($request->input('height'));
-        $x = round($request->input('x'));
-        $y = round($request->input('y'));
-
-        $story = Story::whereProfileId($user->profile_id)->findOrFail($id);
-
-        $path = storage_path('app/'.$story->path);
-
-        if (! is_file($path)) {
-            abort(400, 'Invalid or missing media.');
-        }
-
-        if ($story->type === 'photo') {
-            $img = Intervention::make($path);
-            $img->crop($width, $height, $x, $y);
-            $img->resize(1080, 1920, function ($constraint) {
-                $constraint->aspectRatio();
-            });
-            $img->save($path, config_cache('pixelfed.image_quality'));
-        }
-
-        return [
-            'code' => 200,
-            'msg' => 'Successfully cropped',
-        ];
-    }
-
-    public function publishStory(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'media_id' => 'required',
-            'duration' => 'required|integer|min:3|max:120',
-            'can_reply' => 'required|boolean',
-            'can_react' => 'required|boolean',
-        ]);
-
-        $id = $request->input('media_id');
-        $user = $request->user();
-        abort_if($user->has_roles && ! UserRoleService::can('can-use-stories', $user->id), 403, 'Invalid permissions for this action');
-        $story = Story::whereProfileId($user->profile_id)
-            ->findOrFail($id);
-
-        $story->active = true;
-        $story->duration = $request->input('duration', 10);
-        $story->can_reply = $request->input('can_reply');
-        $story->can_react = $request->input('can_react');
-        $story->save();
-
-        StoryService::delLatest($story->profile_id);
-        StoryFanout::dispatch($story)->onQueue('story');
-        StoryService::addRotateQueue($story->id);
-
-        return [
-            'code' => 200,
-            'msg' => 'Successfully published',
-        ];
-    }
-
-    public function apiV1Delete(Request $request, $id)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $user = $request->user();
-
-        $story = Story::whereProfileId($user->profile_id)
-            ->findOrFail($id);
-        $story->active = false;
-        $story->save();
-
-        StoryDelete::dispatch($story)->onQueue('story');
-
-        return [
-            'code' => 200,
-            'msg' => 'Successfully deleted',
-        ];
-    }
-
-    public function compose(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-        $user = $request->user();
-        abort_if($user->has_roles && ! UserRoleService::can('can-use-stories', $user->id), 403, 'Invalid permissions for this action');
-
-        return view('stories.compose');
-    }
-
-    public function createPoll(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-        abort_if(! config_cache('instance.polls.enabled'), 404);
-
-        return $request->all();
-    }
-
-    public function publishStoryPoll(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'question' => 'required|string|min:6|max:140',
-            'options' => 'required|array|min:2|max:4',
-            'can_reply' => 'required|boolean',
-            'can_react' => 'required|boolean',
-        ]);
-
-        $user = $request->user();
-        abort_if($user->has_roles && ! UserRoleService::can('can-use-stories', $user->id), 403, 'Invalid permissions for this action');
-        $pid = $request->user()->profile_id;
-
-        $count = Story::whereProfileId($pid)
-            ->whereActive(true)
-            ->where('expires_at', '>', now())
-            ->count();
-
-        if ($count >= Story::MAX_PER_DAY) {
-            abort(418, 'You have reached your limit for new Stories today.');
-        }
-
-        $story = new Story;
-        $story->type = 'poll';
-        $story->story = json_encode([
-            'question' => $request->input('question'),
-            'options' => $request->input('options'),
-        ]);
-        $story->public = false;
-        $story->local = true;
-        $story->profile_id = $pid;
-        $story->expires_at = now()->addMinutes(1440);
-        $story->duration = 30;
-        $story->can_reply = false;
-        $story->can_react = false;
-        $story->save();
-
-        $poll = new Poll;
-        $poll->story_id = $story->id;
-        $poll->profile_id = $pid;
-        $poll->poll_options = $request->input('options');
-        $poll->expires_at = $story->expires_at;
-        $poll->cached_tallies = collect($poll->poll_options)->map(function ($o) {
-            return 0;
-        })->toArray();
-        $poll->save();
-
-        $story->active = true;
-        $story->save();
-
-        StoryService::delLatest($story->profile_id);
-
-        return [
-            'code' => 200,
-            'msg' => 'Successfully published',
-        ];
-    }
-
-    public function storyPollVote(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'sid' => 'required',
-            'ci' => 'required|integer|min:0|max:3',
-        ]);
-
-        $pid = $request->user()->profile_id;
-        $ci = $request->input('ci');
-        $story = Story::findOrFail($request->input('sid'));
-        abort_if(! FollowerService::follows($pid, $story->profile_id), 403);
-        $poll = Poll::whereStoryId($story->id)->firstOrFail();
-
-        $vote = new PollVote;
-        $vote->profile_id = $pid;
-        $vote->poll_id = $poll->id;
-        $vote->story_id = $story->id;
-        $vote->status_id = null;
-        $vote->choice = $ci;
-        $vote->save();
-
-        $poll->votes_count = $poll->votes_count + 1;
-        $poll->cached_tallies = collect($poll->getTallies())->map(function ($tally, $key) use ($ci) {
-            return $ci == $key ? $tally + 1 : $tally;
-        })->toArray();
-        $poll->save();
-
-        return 200;
-    }
-
-    public function storeReport(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-
-        $this->validate($request, [
-            'type' => 'required|alpha_dash',
-            'id' => 'required|integer|min:1',
-        ]);
-
-        $user = $request->user();
-        abort_if($user->has_roles && ! UserRoleService::can('can-use-stories', $user->id), 403, 'Invalid permissions for this action');
-
         $pid = $request->user()->profile_id;
         $sid = $request->input('id');
         $type = $request->input('type');
@@ -349,28 +344,28 @@ class StoryComposeController extends Controller
             'copyright',
             'impersonation',
             'scam',
-            'terrorism',
+            'terrorism'
         ];
 
-        abort_if(! in_array($type, $types), 422, 'Invalid story report type');
+        abort_if(!in_array($type, $types), 422, 'Invalid story report type');
 
         $story = Story::findOrFail($sid);
 
         abort_if($story->profile_id == $pid, 422, 'Cannot report your own story');
-        abort_if(! FollowerService::follows($pid, $story->profile_id), 422, 'Cannot report a story from an account you do not follow');
+        abort_if(!FollowerService::follows($pid, $story->profile_id), 422, 'Cannot report a story from an account you do not follow');
 
-        if (Report::whereProfileId($pid)
-            ->whereObjectType('App\Story')
-            ->whereObjectId($story->id)
-            ->exists()
+        if( Report::whereProfileId($pid)
+        	->whereObjectType('App\Story')
+        	->whereObjectId($story->id)
+        	->exists()
         ) {
-            return response()->json(['error' => [
-                'code' => 409,
-                'message' => 'Cannot report the same story again',
-            ]], 409);
+        	return response()->json(['error' => [
+        		'code' => 409,
+        		'message' => 'Cannot report the same story again'
+        	]], 409);
         }
 
-        $report = new Report;
+		$report = new Report;
         $report->profile_id = $pid;
         $report->user_id = $request->user()->id;
         $report->object_id = $story->id;
@@ -381,151 +376,149 @@ class StoryComposeController extends Controller
         $report->save();
 
         return [200];
-    }
+	}
 
-    public function react(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-        $this->validate($request, [
-            'sid' => 'required',
-            'reaction' => 'required|string',
-        ]);
-        $pid = $request->user()->profile_id;
-        $text = $request->input('reaction');
-        $user = $request->user();
-        abort_if($user->has_roles && ! UserRoleService::can('can-use-stories', $user->id), 403, 'Invalid permissions for this action');
-        $story = Story::findOrFail($request->input('sid'));
+	public function react(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+		$this->validate($request, [
+			'sid' => 'required',
+			'reaction' => 'required|string'
+		]);
+		$pid = $request->user()->profile_id;
+		$text = $request->input('reaction');
 
-        abort_if(! $story->can_react, 422);
-        abort_if(StoryService::reactCounter($story->id, $pid) >= 5, 422, 'You have already reacted to this story');
+		$story = Story::findOrFail($request->input('sid'));
 
-        $status = new Status;
-        $status->profile_id = $pid;
-        $status->type = 'story:reaction';
-        $status->caption = $text;
-        $status->rendered = $text;
-        $status->scope = 'direct';
-        $status->visibility = 'direct';
-        $status->in_reply_to_profile_id = $story->profile_id;
-        $status->entities = json_encode([
-            'story_id' => $story->id,
-            'reaction' => $text,
-        ]);
-        $status->save();
+		abort_if(!$story->can_react, 422);
+		abort_if(StoryService::reactCounter($story->id, $pid) >= 5, 422, 'You have already reacted to this story');
 
-        $dm = new DirectMessage;
-        $dm->to_id = $story->profile_id;
-        $dm->from_id = $pid;
-        $dm->type = 'story:react';
-        $dm->status_id = $status->id;
-        $dm->meta = json_encode([
-            'story_username' => $story->profile->username,
-            'story_actor_username' => $request->user()->username,
-            'story_id' => $story->id,
-            'story_media_url' => url(Storage::url($story->path)),
-            'reaction' => $text,
-        ]);
-        $dm->save();
+		$status = new Status;
+		$status->profile_id = $pid;
+		$status->type = 'story:reaction';
+		$status->caption = $text;
+		$status->rendered = $text;
+		$status->scope = 'direct';
+		$status->visibility = 'direct';
+		$status->in_reply_to_profile_id = $story->profile_id;
+		$status->entities = json_encode([
+			'story_id' => $story->id,
+			'reaction' => $text
+		]);
+		$status->save();
 
-        Conversation::updateOrInsert(
-            [
-                'to_id' => $story->profile_id,
-                'from_id' => $pid,
-            ],
-            [
-                'type' => 'story:react',
-                'status_id' => $status->id,
-                'dm_id' => $dm->id,
-                'is_hidden' => false,
-            ]
-        );
+		$dm = new DirectMessage;
+		$dm->to_id = $story->profile_id;
+		$dm->from_id = $pid;
+		$dm->type = 'story:react';
+		$dm->status_id = $status->id;
+		$dm->meta = json_encode([
+			'story_username' => $story->profile->username,
+			'story_actor_username' => $request->user()->username,
+			'story_id' => $story->id,
+			'story_media_url' => url(Storage::url($story->path)),
+			'reaction' => $text
+		]);
+		$dm->save();
 
-        if ($story->local) {
-            // generate notification
-            $n = new Notification;
-            $n->profile_id = $dm->to_id;
-            $n->actor_id = $dm->from_id;
-            $n->item_id = $dm->id;
-            $n->item_type = 'App\DirectMessage';
-            $n->action = 'story:react';
-            $n->save();
-        } else {
-            StoryReactionDeliver::dispatch($story, $status)->onQueue('story');
-        }
+		Conversation::updateOrInsert(
+			[
+				'to_id' => $story->profile_id,
+				'from_id' => $pid
+			],
+			[
+				'type' => 'story:react',
+				'status_id' => $status->id,
+				'dm_id' => $dm->id,
+				'is_hidden' => false
+			]
+		);
 
-        StoryService::reactIncrement($story->id, $pid);
+		if($story->local) {
+			// generate notification
+			$n = new Notification;
+			$n->profile_id = $dm->to_id;
+			$n->actor_id = $dm->from_id;
+			$n->item_id = $dm->id;
+			$n->item_type = 'App\DirectMessage';
+			$n->action = 'story:react';
+			$n->save();
+		} else {
+			StoryReactionDeliver::dispatch($story, $status)->onQueue('story');
+		}
 
-        return 200;
-    }
+		StoryService::reactIncrement($story->id, $pid);
 
-    public function comment(Request $request)
-    {
-        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
-        $this->validate($request, [
-            'sid' => 'required',
-            'caption' => 'required|string',
-        ]);
-        $pid = $request->user()->profile_id;
-        $text = $request->input('caption');
-        $user = $request->user();
-        abort_if($user->has_roles && ! UserRoleService::can('can-use-stories', $user->id), 403, 'Invalid permissions for this action');
-        $story = Story::findOrFail($request->input('sid'));
+		return 200;
+	}
 
-        abort_if(! $story->can_reply, 422);
+	public function comment(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+		$this->validate($request, [
+			'sid' => 'required',
+			'caption' => 'required|string'
+		]);
+		$pid = $request->user()->profile_id;
+		$text = $request->input('caption');
 
-        $status = new Status;
-        $status->type = 'story:reply';
-        $status->profile_id = $pid;
-        $status->caption = $text;
-        $status->rendered = $text;
-        $status->scope = 'direct';
-        $status->visibility = 'direct';
-        $status->in_reply_to_profile_id = $story->profile_id;
-        $status->entities = json_encode([
-            'story_id' => $story->id,
-        ]);
-        $status->save();
+		$story = Story::findOrFail($request->input('sid'));
 
-        $dm = new DirectMessage;
-        $dm->to_id = $story->profile_id;
-        $dm->from_id = $pid;
-        $dm->type = 'story:comment';
-        $dm->status_id = $status->id;
-        $dm->meta = json_encode([
-            'story_username' => $story->profile->username,
-            'story_actor_username' => $request->user()->username,
-            'story_id' => $story->id,
-            'story_media_url' => url(Storage::url($story->path)),
-            'caption' => $text,
-        ]);
-        $dm->save();
+		abort_if(!$story->can_reply, 422);
 
-        Conversation::updateOrInsert(
-            [
-                'to_id' => $story->profile_id,
-                'from_id' => $pid,
-            ],
-            [
-                'type' => 'story:comment',
-                'status_id' => $status->id,
-                'dm_id' => $dm->id,
-                'is_hidden' => false,
-            ]
-        );
+		$status = new Status;
+		$status->type = 'story:reply';
+		$status->profile_id = $pid;
+		$status->caption = $text;
+		$status->rendered = $text;
+		$status->scope = 'direct';
+		$status->visibility = 'direct';
+		$status->in_reply_to_profile_id = $story->profile_id;
+		$status->entities = json_encode([
+			'story_id' => $story->id
+		]);
+		$status->save();
 
-        if ($story->local) {
-            // generate notification
-            $n = new Notification;
-            $n->profile_id = $dm->to_id;
-            $n->actor_id = $dm->from_id;
-            $n->item_id = $dm->id;
-            $n->item_type = 'App\DirectMessage';
-            $n->action = 'story:comment';
-            $n->save();
-        } else {
-            StoryReplyDeliver::dispatch($story, $status)->onQueue('story');
-        }
+		$dm = new DirectMessage;
+		$dm->to_id = $story->profile_id;
+		$dm->from_id = $pid;
+		$dm->type = 'story:comment';
+		$dm->status_id = $status->id;
+		$dm->meta = json_encode([
+			'story_username' => $story->profile->username,
+			'story_actor_username' => $request->user()->username,
+			'story_id' => $story->id,
+			'story_media_url' => url(Storage::url($story->path)),
+			'caption' => $text
+		]);
+		$dm->save();
 
-        return 200;
-    }
+		Conversation::updateOrInsert(
+			[
+				'to_id' => $story->profile_id,
+				'from_id' => $pid
+			],
+			[
+				'type' => 'story:comment',
+				'status_id' => $status->id,
+				'dm_id' => $dm->id,
+				'is_hidden' => false
+			]
+		);
+
+		if($story->local) {
+			// generate notification
+			$n = new Notification;
+			$n->profile_id = $dm->to_id;
+			$n->actor_id = $dm->from_id;
+			$n->item_id = $dm->id;
+			$n->item_type = 'App\DirectMessage';
+			$n->action = 'story:comment';
+			$n->save();
+		} else {
+			StoryReplyDeliver::dispatch($story, $status)->onQueue('story');
+		}
+
+		return 200;
+	}
 }

app/Http/Controllers/StoryController.php

@@ -28,308 +28,288 @@ use League\Fractal\Serializer\ArraySerializer;
 use League\Fractal\Resource\Item;
 use App\Transformer\ActivityPub\Verb\StoryVerb;
 use App\Jobs\StoryPipeline\StoryViewDeliver;
-use App\Services\UserRoleService;
 
 class StoryController extends StoryComposeController
 {
-    public function recent(Request $request)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
-        $user = $request->user();
-        if($user->has_roles && !UserRoleService::can('can-use-stories', $user->id)) {
-            return [];
-        }
-        $pid = $user->profile_id;
+	public function recent(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+		$pid = $request->user()->profile_id;
 
-        if(config('database.default') == 'pgsql') {
-            $s = Cache::remember('pf:stories:recent-by-id:' . $pid, 900, function() use($pid) {
-                return Story::select('stories.*', 'followers.following_id')
-                    ->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
-                    ->where('followers.profile_id', $pid)
-                    ->where('stories.active', true)
-                    ->get()
-                    ->map(function($s) {
-                        $r  = new \StdClass;
-                        $r->id = $s->id;
-                        $r->profile_id = $s->profile_id;
-                        $r->type = $s->type;
-                        $r->path = $s->path;
-                        return $r;
-                    })
-                    ->unique('profile_id');
-            });
+		if(config('database.default') == 'pgsql') {
+			$s = Cache::remember('pf:stories:recent-by-id:' . $pid, 900, function() use($pid) {
+				return Story::select('stories.*', 'followers.following_id')
+					->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
+					->where('followers.profile_id', $pid)
+					->where('stories.active', true)
+					->get()
+					->map(function($s) {
+						$r  = new \StdClass;
+						$r->id = $s->id;
+						$r->profile_id = $s->profile_id;
+						$r->type = $s->type;
+						$r->path = $s->path;
+						return $r;
+					})
+					->unique('profile_id');
+			});
 
-        } else {
-            $s = Cache::remember('pf:stories:recent-by-id:' . $pid, 900, function() use($pid) {
-                return Story::select('stories.*', 'followers.following_id')
-                    ->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
-                    ->where('followers.profile_id', $pid)
-                    ->where('stories.active', true)
-                    ->groupBy('followers.following_id')
-                    ->orderByDesc('id')
-                    ->get();
-            });
-        }
+		} else {
+			$s = Cache::remember('pf:stories:recent-by-id:' . $pid, 900, function() use($pid) {
+				return Story::select('stories.*', 'followers.following_id')
+					->leftJoin('followers', 'followers.following_id', 'stories.profile_id')
+					->where('followers.profile_id', $pid)
+					->where('stories.active', true)
+					->groupBy('followers.following_id')
+					->orderByDesc('id')
+					->get();
+			});
+		}
 
-        $self = Cache::remember('pf:stories:recent-self:' . $pid, 21600, function() use($pid) {
-            return Story::whereProfileId($pid)
-                ->whereActive(true)
-                ->orderByDesc('id')
-                ->limit(1)
-                ->get()
-                ->map(function($s) use($pid) {
-                    $r  = new \StdClass;
-                    $r->id = $s->id;
-                    $r->profile_id = $pid;
-                    $r->type = $s->type;
-                    $r->path = $s->path;
-                    return $r;
-                });
-        });
+		$self = Cache::remember('pf:stories:recent-self:' . $pid, 21600, function() use($pid) {
+			return Story::whereProfileId($pid)
+				->whereActive(true)
+				->orderByDesc('id')
+				->limit(1)
+				->get()
+				->map(function($s) use($pid) {
+					$r  = new \StdClass;
+					$r->id = $s->id;
+					$r->profile_id = $pid;
+					$r->type = $s->type;
+					$r->path = $s->path;
+					return $r;
+				});
+		});
 
-        if($self->count()) {
-            $s->prepend($self->first());
-        }
+		if($self->count()) {
+			$s->prepend($self->first());
+		}
 
-        $res = $s->map(function($s) use($pid) {
-            $profile = AccountService::get($s->profile_id);
-            $url = $profile['local'] ? url("/stories/{$profile['username']}") :
-                url("/i/rs/{$profile['id']}");
-            return [
-                'pid' => $profile['id'],
-                'avatar' => $profile['avatar'],
-                'local' => $profile['local'],
-                'username'  => $profile['acct'],
-                'latest' => [
-                    'id' => $s->id,
-                    'type' => $s->type,
-                    'preview_url' => url(Storage::url($s->path))
-                ],
-                'url' => $url,
-                'seen' => StoryService::hasSeen($pid, StoryService::latest($s->profile_id)),
-                'sid' => $s->id
-            ];
-        })
-        ->sortBy('seen')
-        ->values();
-        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
-    }
+		$res = $s->map(function($s) use($pid) {
+			$profile = AccountService::get($s->profile_id);
+			$url = $profile['local'] ? url("/stories/{$profile['username']}") :
+				url("/i/rs/{$profile['id']}");
+			return [
+				'pid' => $profile['id'],
+				'avatar' => $profile['avatar'],
+				'local' => $profile['local'],
+				'username'	=> $profile['acct'],
+				'latest' => [
+					'id' => $s->id,
+					'type' => $s->type,
+					'preview_url' => url(Storage::url($s->path))
+				],
+				'url' => $url,
+				'seen' => StoryService::hasSeen($pid, StoryService::latest($s->profile_id)),
+				'sid' => $s->id
+			];
+		})
+		->sortBy('seen')
+		->values();
+		return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+	}
 
-    public function profile(Request $request, $id)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
+	public function profile(Request $request, $id)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-        $user = $request->user();
-        if($user->has_roles && !UserRoleService::can('can-use-stories', $user->id)) {
-            return [];
-        }
-        $authed = $user->profile_id;
-        $profile = Profile::findOrFail($id);
+		$authed = $request->user()->profile_id;
+		$profile = Profile::findOrFail($id);
 
-        if($authed != $profile->id && !FollowerService::follows($authed, $profile->id)) {
-            return abort([], 403);
-        }
+		if($authed != $profile->id && !FollowerService::follows($authed, $profile->id)) {
+			return abort([], 403);
+		}
 
-        $stories = Story::whereProfileId($profile->id)
-        ->whereActive(true)
-        ->orderBy('expires_at')
-        ->get()
-        ->map(function($s, $k) use($authed) {
-            $seen = StoryService::hasSeen($authed, $s->id);
-            $res = [
-                'id' => (string) $s->id,
-                'type' => $s->type,
-                'duration' => $s->duration,
-                'src' => url(Storage::url($s->path)),
-                'created_at' => $s->created_at->toAtomString(),
-                'expires_at' => $s->expires_at->toAtomString(),
-                'view_count' => ($authed == $s->profile_id) ? ($s->view_count ?? 0) : null,
-                'seen' => $seen,
-                'progress' => $seen ? 100 : 0,
-                'can_reply' => (bool) $s->can_reply,
-                'can_react' => (bool) $s->can_react
-            ];
+		$stories = Story::whereProfileId($profile->id)
+		->whereActive(true)
+		->orderBy('expires_at')
+		->get()
+		->map(function($s, $k) use($authed) {
+			$seen = StoryService::hasSeen($authed, $s->id);
+			$res = [
+				'id' => (string) $s->id,
+				'type' => $s->type,
+				'duration' => $s->duration,
+				'src' => url(Storage::url($s->path)),
+				'created_at' => $s->created_at->toAtomString(),
+				'expires_at' => $s->expires_at->toAtomString(),
+				'view_count' => ($authed == $s->profile_id) ? ($s->view_count ?? 0) : null,
+				'seen' => $seen,
+				'progress' => $seen ? 100 : 0,
+				'can_reply' => (bool) $s->can_reply,
+				'can_react' => (bool) $s->can_react
+			];
 
-            if($s->type == 'poll') {
-                $res['question'] = json_decode($s->story, true)['question'];
-                $res['options'] = json_decode($s->story, true)['options'];
-                $res['voted'] = PollService::votedStory($s->id, $authed);
-                if($res['voted']) {
-                    $res['voted_index'] = PollService::storyChoice($s->id, $authed);
-                }
-            }
+			if($s->type == 'poll') {
+				$res['question'] = json_decode($s->story, true)['question'];
+				$res['options'] = json_decode($s->story, true)['options'];
+				$res['voted'] = PollService::votedStory($s->id, $authed);
+				if($res['voted']) {
+					$res['voted_index'] = PollService::storyChoice($s->id, $authed);
+				}
+			}
 
-            return $res;
-        })->toArray();
-        if(count($stories) == 0) {
-            return [];
-        }
-        $cursor = count($stories) - 1;
-        $stories = [[
-            'id' => (string) $stories[$cursor]['id'],
-            'nodes' => $stories,
-            'account' => AccountService::get($profile->id),
-            'pid' => (string) $profile->id
-        ]];
-        return response()->json($stories, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
-    }
+			return $res;
+		})->toArray();
+		if(count($stories) == 0) {
+			return [];
+		}
+		$cursor = count($stories) - 1;
+		$stories = [[
+			'id' => (string) $stories[$cursor]['id'],
+			'nodes' => $stories,
+			'account' => AccountService::get($profile->id),
+			'pid' => (string) $profile->id
+		]];
+		return response()->json($stories, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+	}
 
-    public function viewed(Request $request)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
+	public function viewed(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-        $this->validate($request, [
-            'id'    => 'required|min:1',
-        ]);
-        $id = $request->input('id');
-        $user = $request->user();
-        if($user->has_roles && !UserRoleService::can('can-use-stories', $user->id)) {
-            return [];
-        }
-        $authed = $user->profile;
+		$this->validate($request, [
+			'id'	=> 'required|min:1',
+		]);
+		$id = $request->input('id');
 
-        $story = Story::with('profile')
-            ->findOrFail($id);
-        $exp = $story->expires_at;
+		$authed = $request->user()->profile;
 
-        $profile = $story->profile;
+		$story = Story::with('profile')
+			->findOrFail($id);
+		$exp = $story->expires_at;
 
-        if($story->profile_id == $authed->id) {
-            return [];
-        }
+		$profile = $story->profile;
 
-        $publicOnly = (bool) $profile->followedBy($authed);
-        abort_if(!$publicOnly, 403);
+		if($story->profile_id == $authed->id) {
+			return [];
+		}
 
-        $v = StoryView::firstOrCreate([
-            'story_id' => $id,
-            'profile_id' => $authed->id
-        ]);
+		$publicOnly = (bool) $profile->followedBy($authed);
+		abort_if(!$publicOnly, 403);
 
-        if($v->wasRecentlyCreated) {
-            Story::findOrFail($story->id)->increment('view_count');
+		$v = StoryView::firstOrCreate([
+			'story_id' => $id,
+			'profile_id' => $authed->id
+		]);
 
-            if($story->local == false) {
-                StoryViewDeliver::dispatch($story, $authed)->onQueue('story');
-            }
-        }
+		if($v->wasRecentlyCreated) {
+			Story::findOrFail($story->id)->increment('view_count');
 
-        Cache::forget('stories:recent:by_id:' . $authed->id);
-        StoryService::addSeen($authed->id, $story->id);
-        return ['code' => 200];
-    }
+			if($story->local == false) {
+				StoryViewDeliver::dispatch($story, $authed)->onQueue('story');
+			}
+		}
 
-    public function exists(Request $request, $id)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
-        $user = $request->user();
-        if($user->has_roles && !UserRoleService::can('can-use-stories', $user->id)) {
-            return response()->json(false);
-        }
-        return response()->json(Story::whereProfileId($id)
-        ->whereActive(true)
-        ->exists());
-    }
+		Cache::forget('stories:recent:by_id:' . $authed->id);
+		StoryService::addSeen($authed->id, $story->id);
+		return ['code' => 200];
+	}
 
-    public function iRedirect(Request $request)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
+	public function exists(Request $request, $id)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-        $user = $request->user();
-        abort_if(!$user, 404);
-        $username = $user->username;
-        return redirect("/stories/{$username}");
-    }
+		return response()->json(Story::whereProfileId($id)
+		->whereActive(true)
+		->exists());
+	}
 
-    public function viewers(Request $request)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
+	public function iRedirect(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-        $this->validate($request, [
-            'sid' => 'required|string'
-        ]);
+		$user = $request->user();
+		abort_if(!$user, 404);
+		$username = $user->username;
+		return redirect("/stories/{$username}");
+	}
 
-        $user = $request->user();
-        if($user->has_roles && !UserRoleService::can('can-use-stories', $user->id)) {
-            return response()->json([]);
-        }
+	public function viewers(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-        $pid = $request->user()->profile_id;
-        $sid = $request->input('sid');
+		$this->validate($request, [
+			'sid' => 'required|string'
+		]);
 
-        $story = Story::whereProfileId($pid)
-            ->whereActive(true)
-            ->findOrFail($sid);
+		$pid = $request->user()->profile_id;
+		$sid = $request->input('sid');
 
-        $viewers = StoryView::whereStoryId($story->id)
-            ->latest()
-            ->simplePaginate(10)
-            ->map(function($view) {
-                return AccountService::get($view->profile_id);
-            })
-            ->values();
+		$story = Story::whereProfileId($pid)
+			->whereActive(true)
+			->findOrFail($sid);
 
-        return response()->json($viewers, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
-    }
+		$viewers = StoryView::whereStoryId($story->id)
+			->latest()
+			->simplePaginate(10)
+			->map(function($view) {
+				return AccountService::get($view->profile_id);
+			})
+			->values();
 
-    public function remoteStory(Request $request, $id)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
+		return response()->json($viewers, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+	}
 
-        $profile = Profile::findOrFail($id);
-        if($profile->user_id != null || $profile->domain == null) {
-            return redirect('/stories/' . $profile->username);
-        }
-        $pid = $profile->id;
-        return view('stories.show_remote', compact('pid'));
-    }
+	public function remoteStory(Request $request, $id)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-    public function pollResults(Request $request)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
+		$profile = Profile::findOrFail($id);
+		if($profile->user_id != null || $profile->domain == null) {
+			return redirect('/stories/' . $profile->username);
+		}
+		$pid = $profile->id;
+		return view('stories.show_remote', compact('pid'));
+	}
 
-        $this->validate($request, [
-            'sid' => 'required|string'
-        ]);
+	public function pollResults(Request $request)
+	{
+		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-        $pid = $request->user()->profile_id;
-        $sid = $request->input('sid');
+		$this->validate($request, [
+			'sid' => 'required|string'
+		]);
 
-        $story = Story::whereProfileId($pid)
-            ->whereActive(true)
-            ->findOrFail($sid);
+		$pid = $request->user()->profile_id;
+		$sid = $request->input('sid');
 
-        return PollService::storyResults($sid);
-    }
+		$story = Story::whereProfileId($pid)
+			->whereActive(true)
+			->findOrFail($sid);
 
-    public function getActivityObject(Request $request, $username, $id)
-    {
-        abort_if(!(bool) config_cache('instance.stories.enabled'), 404);
+		return PollService::storyResults($sid);
+	}
 
-        if(!$request->wantsJson()) {
-            return redirect('/stories/' . $username);
-        }
+	public function getActivityObject(Request $request, $username, $id)
+	{
+		abort_if(!config_cache('instance.stories.enabled'), 404);
 
-        abort_if(!$request->hasHeader('Authorization'), 404);
+		if(!$request->wantsJson()) {
+			return redirect('/stories/' . $username);
+		}
 
-        $profile = Profile::whereUsername($username)->whereNull('domain')->firstOrFail();
-        $story = Story::whereActive(true)->whereProfileId($profile->id)->findOrFail($id);
+		abort_if(!$request->hasHeader('Authorization'), 404);
 
-        abort_if($story->bearcap_token == null, 404);
-        abort_if(now()->gt($story->expires_at), 404);
-        $token = substr($request->header('Authorization'), 7);
-        abort_if(hash_equals($story->bearcap_token, $token) === false, 404);
-        abort_if($story->created_at->lt(now()->subMinutes(20)), 404);
+		$profile = Profile::whereUsername($username)->whereNull('domain')->firstOrFail();
+		$story = Story::whereActive(true)->whereProfileId($profile->id)->findOrFail($id);
 
-        $fractal = new Manager();
-        $fractal->setSerializer(new ArraySerializer());
-        $resource = new Item($story, new StoryVerb());
-        $res = $fractal->createData($resource)->toArray();
-        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
-    }
+		abort_if($story->bearcap_token == null, 404);
+		abort_if(now()->gt($story->expires_at), 404);
+		$token = substr($request->header('Authorization'), 7);
+		abort_if(hash_equals($story->bearcap_token, $token) === false, 404);
+		abort_if($story->created_at->lt(now()->subMinutes(20)), 404);
 
-    public function showSystemStory()
-    {
-        // return view('stories.system');
-    }
+		$fractal = new Manager();
+		$fractal->setSerializer(new ArraySerializer());
+		$resource = new Item($story, new StoryVerb());
+		$res = $fractal->createData($resource)->toArray();
+		return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+	}
+
+	public function showSystemStory()
+	{
+		// return view('stories.system');
+	}
 }

app/Http/Controllers/UserEmailForgotController.php

@@ -1,131 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\User;
-use App\Models\UserEmailForgot;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Mail;
-use App\Mail\UserEmailForgotReminder;
-use Illuminate\Support\Facades\RateLimiter;
-
-class UserEmailForgotController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware('guest');
-        abort_unless(config('security.forgot-email.enabled'), 404);
-    }
-
-    public function index(Request $request)
-    {
-        abort_if($request->user(), 404);
-        return view('auth.email.forgot');
-    }
-
-    public function store(Request $request)
-    {
-        $rules = [
-            'username' => 'required|min:2|max:15|exists:users'
-        ];
-
-        $messages = [
-            'username.exists' => 'This username is no longer active or does not exist!'
-        ];
-
-        if((bool) config_cache('captcha.enabled')) {
-            $rules['h-captcha-response'] = 'required|captcha';
-            $messages['h-captcha-response.required'] = 'You need to complete the captcha!';
-        }
-
-        $randomDelay = random_int(500000, 2000000);
-        usleep($randomDelay);
-
-        $this->validate($request, $rules, $messages);
-        $check = self::checkLimits();
-
-        if(!$check) {
-            return redirect()->back()->withErrors([
-                'username' => 'Please try again later, we\'ve reached our quota and cannot process any more requests at this time.'
-            ]);
-        }
-
-        $user = User::whereUsername($request->input('username'))
-            ->whereNotNull('email_verified_at')
-            ->whereNull('status')
-            ->whereIsAdmin(false)
-            ->first();
-
-        if(!$user) {
-            return redirect()->back()->withErrors([
-                'username' => 'Invalid username or account. It may not exist, or does not have a verified email, is an admin account or is disabled.'
-            ]);
-        }
-
-        $exists = UserEmailForgot::whereUserId($user->id)
-            ->where('email_sent_at', '>', now()->subHours(24))
-            ->count();
-
-        if($exists) {
-            return redirect()->back()->withErrors([
-                'username' => 'An email reminder was recently sent to this account, please try again after 24 hours!'
-            ]);
-        }
-
-        return $this->storeHandle($request, $user);
-    }
-
-    protected function storeHandle($request, $user)
-    {
-        UserEmailForgot::create([
-            'user_id' => $user->id,
-            'ip_address' => $request->ip(),
-            'user_agent' => $request->userAgent(),
-            'email_sent_at' => now()
-        ]);
-
-        Mail::to($user->email)->send(new UserEmailForgotReminder($user));
-        self::getLimits(true);
-        return redirect()->back()->with(['status' => 'Successfully sent an email reminder!']);
-    }
-
-    public static function checkLimits()
-    {
-        $limits = self::getLimits();
-
-        if(
-            $limits['current']['hourly'] >= $limits['max']['hourly'] ||
-            $limits['current']['daily'] >= $limits['max']['daily'] ||
-            $limits['current']['weekly'] >= $limits['max']['weekly'] ||
-            $limits['current']['monthly'] >= $limits['max']['monthly']
-        ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public static function getLimits($forget = false)
-    {
-        return [
-            'max' => config('security.forgot-email.limits.max'),
-            'current' => [
-                'hourly' => self::activeCount(60, $forget),
-                'daily' => self::activeCount(1440, $forget),
-                'weekly' => self::activeCount(10080, $forget),
-                'monthly' => self::activeCount(43800, $forget)
-            ]
-        ];
-    }
-
-    public static function activeCount($mins, $forget = false)
-    {
-        if($forget) {
-            Cache::forget('pf:auth:forgot-email:active-count:dur-' . $mins);
-        }
-        return Cache::remember('pf:auth:forgot-email:active-count:dur-' . $mins, 14200, function() use($mins) {
-            return UserEmailForgot::where('email_sent_at', '>', now()->subMinutes($mins))->count();
-        });
-    }
-}

app/Http/Controllers/UserRolesController.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Services\UserRoleService;
-
-class UserRolesController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-
-    public function getRoles(Request $request)
-    {
-        $this->validate($request, [
-            'id' => 'required'
-        ]);
-
-        return UserRoleService::getRoles($request->user()->id);
-    }
-}

app/Http/Kernel.php

@@ -14,12 +14,12 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Illuminate\Http\Middleware\HandleCors::class,
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \App\Http\Middleware\TrustProxies::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
     ];
 
     /**

app/Http/Requests/ProfileMigrationStoreRequest.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Models\ProfileMigration;
-use App\Services\FetchCacheService;
-use App\Services\WebfingerService;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;
-
-class ProfileMigrationStoreRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        if ((bool) config_cache('federation.activitypub.enabled') === false ||
-            (bool) config_cache('federation.migration') === false) {
-            return false;
-        }
-        if (! $this->user() || $this->user()->status) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'acct' => 'required|email',
-            'password' => 'required|current_password',
-        ];
-    }
-
-    public function after(): array
-    {
-        return [
-            function (Validator $validator) {
-                $err = $this->validateNewAccount();
-                if ($err !== 'noerr') {
-                    $validator->errors()->add(
-                        'acct',
-                        $err
-                    );
-                }
-            },
-        ];
-    }
-
-    protected function validateNewAccount()
-    {
-        if (ProfileMigration::whereProfileId($this->user()->profile_id)->where('created_at', '>', now()->subDays(30))->exists()) {
-            return 'Error - You have migrated your account in the past 30 days, you can only perform a migration once per 30 days.';
-        }
-        $acct = WebfingerService::rawGet($this->acct);
-        if (! $acct) {
-            return 'The new account you provided is not responding to our requests.';
-        }
-        $pr = FetchCacheService::getJson($acct);
-        if (! $pr || ! isset($pr['alsoKnownAs'])) {
-            return 'Invalid account lookup response.';
-        }
-        if (! count($pr['alsoKnownAs']) || ! is_array($pr['alsoKnownAs'])) {
-            return 'The new account does not contain an alias to your current account.';
-        }
-        $curAcctUrl = $this->user()->profile->permalink();
-        if (! in_array($curAcctUrl, $pr['alsoKnownAs'])) {
-            return 'The new account does not contain an alias to your current account.';
-        }
-
-        return 'noerr';
-    }
-}

app/Http/Requests/Status/StoreStatusEditRequest.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Requests\Status;
 
+use Illuminate\Foundation\Http\FormRequest;
 use App\Media;
 use App\Status;
 use Closure;
-use Illuminate\Foundation\Http\FormRequest;
 
 class StoreStatusEditRequest extends FormRequest
 {
@@ -14,25 +14,24 @@ class StoreStatusEditRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        $profile = $this->user()->profile;
-        if ($profile->status != null) {
-            return false;
-        }
-        if ($profile->unlisted == true && $profile->cw == true) {
-            return false;
-        }
-        $types = [
-            'photo',
-            'photo:album',
-            'photo:video:album',
-            'reply',
-            'text',
-            'video',
-            'video:album',
-        ];
-        $scopes = ['public', 'unlisted', 'private'];
-        $status = Status::whereNull('reblog_of_id')->whereIn('type', $types)->whereIn('scope', $scopes)->find($this->route('id'));
-
+    	$profile = $this->user()->profile;
+    	if($profile->status != null) {
+    		return false;
+    	}
+    	if($profile->unlisted == true && $profile->cw == true) {
+    		return false;
+    	}
+    	$types = [
+			"photo",
+			"photo:album",
+			"photo:video:album",
+			"reply",
+			"text",
+			"video",
+			"video:album"
+    	];
+    	$scopes = ['public', 'unlisted', 'private'];
+    	$status = Status::whereNull('reblog_of_id')->whereIn('type', $types)->whereIn('scope', $scopes)->find($this->route('id'));
         return $status && $this->user()->profile_id === $status->profile_id;
     }
 
@@ -48,18 +47,18 @@ class StoreStatusEditRequest extends FormRequest
             'spoiler_text' => 'nullable|string|max:140',
             'sensitive' => 'sometimes|boolean',
             'media_ids' => [
-                'nullable',
-                'required_without:status',
-                'array',
-                'max:'.(int) config_cache('pixelfed.max_album_length'),
-                function (string $attribute, mixed $value, Closure $fail) {
-                    Media::whereProfileId($this->user()->profile_id)
-                        ->where(function ($query) {
-                            return $query->whereNull('status_id')
-                                ->orWhere('status_id', '=', $this->route('id'));
-                        })
-                        ->findOrFail($value);
-                },
+            	'nullable',
+            	'required_without:status',
+            	'array',
+            	'max:' . config('pixelfed.max_album_length'),
+				function (string $attribute, mixed $value, Closure $fail) {
+					Media::whereProfileId($this->user()->profile_id)
+						->where(function($query) {
+							return $query->whereNull('status_id')
+							->orWhere('status_id', '=', $this->route('id'));
+						})
+						->findOrFail($value);
+				},
             ],
             'location' => 'sometimes|nullable',
             'location.id' => 'sometimes|integer|min:1|max:128769',

app/Http/Resources/AdminProfile.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Services\AccountService;
-
-class AdminProfile extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        $res = AccountService::get($this->id, true);
-        $res['domain'] = $this->domain;
-        $res['status'] = $this->status;
-        $res['limits'] = [
-            'exist' => $this->cw || $this->unlisted || $this->no_autolink,
-            'autocw' => (bool) $this->cw,
-            'unlisted' => (bool) $this->unlisted,
-            'no_autolink' => (bool) $this->no_autolink,
-            'banned' => (bool) $this->status == 'banned'
-        ];
-        return $res;
-    }
-}

app/Http/Resources/AdminRemoteReport.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Instance;
-use App\Services\AccountService;
-use App\Services\StatusService;
-
-class AdminRemoteReport extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        $instance = parse_url($this->uri, PHP_URL_HOST);
-        $statuses = [];
-        if($this->status_ids && count($this->status_ids)) {
-            foreach($this->status_ids as $sid) {
-                $s = StatusService::get($sid, false);
-                if($s && $s['in_reply_to_id'] != null) {
-                    $parent = StatusService::get($s['in_reply_to_id'], false);
-                    if($parent) {
-                        $s['parent'] = $parent;
-                    }
-                }
-                if($s) {
-                    $statuses[] = $s;
-                }
-            }
-        }
-        $res = [
-            'id' => $this->id,
-            'instance' => $instance,
-            'reported' => AccountService::get($this->account_id, true),
-            'status_ids' => $this->status_ids,
-            'statuses' => $statuses,
-            'message' => $this->comment,
-            'report_meta' => $this->report_meta,
-            'created_at' => optional($this->created_at)->format('c'),
-            'action_taken_at' => optional($this->action_taken_at)->format('c'),
-        ];
-        return $res;
-    }
-}

app/Http/Resources/StoryView.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Services\AccountService;
-
-class StoryView extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request)
-    {
-        return AccountService::get($this->profile_id, true);
-    }
-}

app/Instance.php

@@ -6,77 +6,63 @@ use Illuminate\Database\Eloquent\Model;
 
 class Instance extends Model
 {
-    protected $casts = [
-        'last_crawled_at' => 'datetime',
-        'actors_last_synced_at' => 'datetime',
-        'notes' => 'array',
-        'nodeinfo_last_fetched' => 'datetime',
-        'delivery_next_after' => 'datetime',
-    ];
+	protected $fillable = ['domain', 'banned', 'auto_cw', 'unlisted', 'notes'];
 
-    protected $fillable = [
-        'domain',
-        'banned',
-        'auto_cw',
-        'unlisted',
-        'notes'
-    ];
+	public function profiles()
+	{
+		return $this->hasMany(Profile::class, 'domain', 'domain');
+	}
 
-    public function profiles()
-    {
-        return $this->hasMany(Profile::class, 'domain', 'domain');
-    }
+	public function statuses()
+	{
+		return $this->hasManyThrough(
+			Status::class,
+			Profile::class,
+			'domain',
+			'profile_id',
+			'domain',
+			'id'
+		);
+	}
 
-    public function statuses()
-    {
-        return $this->hasManyThrough(
-            Status::class,
-            Profile::class,
-            'domain',
-            'profile_id',
-            'domain',
-            'id'
-        );
-    }
+	public function reported()
+	{
+		return $this->hasManyThrough(
+			Report::class,
+			Profile::class,
+			'domain',
+			'reported_profile_id',
+			'domain',
+			'id'
+		);
+	}
 
-    public function reported()
-    {
-        return $this->hasManyThrough(
-            Report::class,
-            Profile::class,
-            'domain',
-            'reported_profile_id',
-            'domain',
-            'id'
-        );
-    }
+	public function reports()
+	{
+		return $this->hasManyThrough(
+			Report::class,
+			Profile::class,
+			'domain',
+			'profile_id',
+			'domain',
+			'id'
+		);
+	}
 
-    public function reports()
-    {
-        return $this->hasManyThrough(
-            Report::class,
-            Profile::class,
-            'domain',
-            'profile_id',
-            'domain',
-            'id'
-        );
-    }
+	public function media()
+	{
+		return $this->hasManyThrough(
+			Media::class,
+			Profile::class,
+			'domain',
+			'profile_id',
+			'domain',
+			'id'
+		);
+	}
 
-    public function media()
-    {
-        return $this->hasManyThrough(
-            Media::class,
-            Profile::class,
-            'domain',
-            'profile_id',
-            'domain',
-            'id'
-        );
-    }
-
-    public function getUrl()
-    {
-        return url("/i/admin/instances/show/{$this->id}");
-    }
+	public function getUrl()
+	{
+		return url("/i/admin/instances/show/{$this->id}");
+	}
 }

app/Jobs/AdminPipeline/AdminProfileActionPipeline.php

@@ -1,139 +0,0 @@
-<?php
-
-namespace App\Jobs\AdminPipeline;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Avatar;
-use App\Follower;
-use App\Instance;
-use App\Media;
-use App\Profile;
-use App\Status;
-use Cache;
-use Storage;
-use Purify;
-use App\Services\ActivityPubFetchService;
-use App\Services\AccountService;
-use App\Services\MediaStorageService;
-use App\Services\StatusService;
-use App\Jobs\StatusPipeline\RemoteStatusDelete;
-
-class AdminProfileActionPipeline implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $action;
-    protected $profile;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct($profile, $action)
-    {
-        $this->profile = $profile;
-        $this->action = $action;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $profile = $this->profile;
-        $action = $this->action;
-
-        switch($action) {
-            case 'mark-all-cw':
-                return $this->markAllPostsWithContentWarnings();
-            break;
-            case 'unlist-all':
-                return $this->unlistAllPosts();
-            break;
-            case 'purge':
-                return $this->purgeAllPosts();
-            break;
-            case 'refetch':
-                return $this->refetchAllPosts();
-            break;
-        }
-    }
-
-    protected function markAllPostsWithContentWarnings()
-    {
-        $profile = $this->profile;
-
-        foreach(Status::whereProfileId($profile->id)->lazyById(10, 'id') as $status) {
-            if($status->scope == 'direct') {
-                continue;
-            }
-            $status->is_nsfw = true;
-            $status->save();
-            StatusService::del($status->id);
-        }
-    }
-
-    protected function unlistAllPosts()
-    {
-        $profile = $this->profile;
-
-        foreach(Status::whereProfileId($profile->id)->lazyById(10, 'id') as $status) {
-            if($status->scope != 'public') {
-                continue;
-            }
-            $status->scope = 'unlisted';
-            $status->visibility = 'unlisted';
-            $status->save();
-            StatusService::del($status->id);
-        }
-    }
-
-    protected function purgeAllPosts()
-    {
-        $profile = $this->profile;
-
-        foreach(Status::withTrashed()->whereProfileId($profile->id)->lazyById(10, 'id') as $status) {
-            RemoteStatusDelete::dispatch($status)->onQueue('delete');
-        }
-    }
-
-    protected function refetchAllPosts()
-    {
-        $profile = $this->profile;
-        $res = ActivityPubFetchService::get($profile->remote_url, false);
-        if(!$res) {
-            return;
-        }
-        $res = json_decode($res, true);
-        $profile->following_count = Follower::whereProfileId($profile->id)->count();
-        $profile->followers_count = Follower::whereFollowingId($profile->id)->count();
-        $profile->name = isset($res['name']) ? Purify::clean($res['name']) : $profile->username;
-        $profile->bio = isset($res['summary']) ? Purify::clean($res['summary']) : null;
-        if(isset($res['publicKey'])) {
-            $profile->public_key = $res['publicKey']['publicKeyPem'];
-        }
-        if(
-            isset($res['icon']) &&
-            isset(
-                $res['icon']['type'],
-                $res['icon']['mediaType'],
-                $res['icon']['url']) && $res['icon']['type'] == 'Image'
-        ) {
-            if(in_array($res['icon']['mediaType'], ['image/jpeg', 'image/png'])) {
-                $profile->avatar->remote_url = $res['icon']['url'];
-                $profile->push();
-                MediaStorageService::avatar($profile->avatar);
-            }
-        }
-        $profile->save();
-        AccountService::del($profile->id);
-    }
-}